[AT&T Samsung Galaxy S II Skyrocket SGH-I727] m4570d0n:
yes.

git commit -a

If you mean you want to just merge all the changes from CM's repo into your local repo from nitroglycerine33, you could add CM's repo as a remote source and then do the merge. To do that you would do this:

1) Change to the directory and add the remote branch:

cd frameworks/opt/telephony
git remote add -t cm-10.2 -m cm-10.2 upstream https://github.com/CyanogenMod/android_frameworks_opt_telephony.git

(for more info take a look here. For info on the -t and -m options, just run git remote --help)

2) Pull in changes from CM:

git fetch upstream

That will pull in all the changes not present in your local repository, without modifying your files (the changes are stored in the .git folder as a point of reference/comparison but aren't applied yet to the local files).

3) Then merge the changes:

git merge upstream/cm-10.2

If you're lucky and there are no conflicts, then that's it. You're done.

*Note: Since it's not always clear when reading up on git-related stuffs, I thought I should point out that "upstream" is not a static command parameter/option. It's just the name you give for the remote source. For simplicity and as standard practice, nearly all guides/how-to's use the "upstream" name in their examples but you could use whatever name you want. If you wanted to name it "lolwut" instead, the commands above would look like this:

git remote add -t cm-10.2 -m cm-10.2 lolwut https://github.com/CyanogenMod/android_frameworks_opt_telephony.git
git fetch lolwut
git merge lolwut/cm-10.2

**Note 2: I decided to clone that repo from nitroglycerince33/android_frameworks_opt_telephony and ran through the commands real quick just to refresh my memory and make sure I wasn't being retarded. When I did the merge though, it failed with the following conflicts:

Auto-merging src/java/com/android/internal/telephony/uicc/UiccCard.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/uicc/UiccCard.java
Auto-merging src/java/com/android/internal/telephony/uicc/RuimRecords.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/uicc/RuimRecords.java
Auto-merging src/java/com/android/internal/telephony/uicc/IccRecords.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/uicc/IccRecords.java
Auto-merging src/java/com/android/internal/telephony/uicc/IccCardProxy.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/uicc/IccCardProxy.java
Auto-merging src/java/com/android/internal/telephony/dataconnection/DcTracker.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/dataconnection/DcTracker.java
Auto-merging src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
Auto-merging src/java/com/android/internal/telephony/SamsungQualcommRIL.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/SamsungQualcommRIL.java
Auto-merging src/java/com/android/internal/telephony/SamsungExynos3RIL.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/SamsungExynos3RIL.java
Auto-merging src/java/com/android/internal/telephony/PhoneProxy.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/PhoneProxy.java
Auto-merging src/java/com/android/internal/telephony/Phone.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/Phone.java
Auto-merging src/java/com/android/internal/telephony/HTCQualcommRIL.java
CONFLICT (add/add): Merge conflict in src/java/com/android/internal/telephony/HTCQualcommRIL.java
Automatic merge failed; fix conflicts and then commit the result.

As it vaguely mentions on the last line there, you have to go to each one of those files and find where the problem occurred and fix it manually. The merge fail will add some pointers in each of those files though to show you where the error is. For example, picking a random file from that list (src/java/com/android/internal/telephony/uicc/RuimRecords.java), open the file and scroll down to line #43 and you'll see this:

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;
[COLOR=RoyalBlue]<<<<<<< HEAD
=======[/COLOR]
import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
[COLOR=RoyalBlue]>>>>>>> upstream/cm-10.2[/COLOR]

/**
* {@hide}
*/
public final class RuimRecords extends IccRecords {
static final String LOG_TAG = "RuimRecords";

private boolean mOtaCommited=false;

// ***** Instance Variables

private String mMyMobileNumber;
private String mMin2Min1;

private String mPrlVersion;
[COLOR=RoyalBlue]<<<<<<< HEAD
=======[/COLOR]
private boolean mRecordsRequired = false;
[COLOR=RoyalBlue]>>>>>>> upstream/cm-10.2[/COLOR]
// From CSIM application

And starting at line #657:

@[URL="http://xdaforums.com/member.php?u=439709"]override[/URL]
public void onReady() {
fetchRuimRecords();

mCi.getCDMASubscription(obtainMessage(EVENT_GET_CDMA_SUBSCRIPTION_DONE));
}

[COLOR=RoyalBlue]<<<<<<< HEAD[/COLOR]

[COLOR=Red]private void fetchRuimRecords() {[/COLOR]
[COLOR=RoyalBlue]=======[/COLOR]
/**
* Called by IccCardProxy before it requests records.
* We use this as a trigger to read records from the card.
*/
void recordsRequired() {
if (DBG) log("recordsRequired");
mRecordsRequired = true;

// trigger to retrieve all records
fetchRuimRecords();
}

private void fetchRuimRecords() {
/* Don't read records if we don't expect
* anyone to ask for them
*
* If we have already requested records OR
* records are not required by anyone OR
* the app is not ready
* then bail
*/
if (mRecordsRequested || !mRecordsRequired
|| AppState.APPSTATE_READY != mParentApp.getState()) {
if (DBG) log("fetchRuimRecords: Abort fetching records rRecordsRequested = "
+ mRecordsRequested
+ " state = " + mParentApp.getState()
+ " required = " + mRecordsRequired);
return;
}

[COLOR=RoyalBlue]>>>>>>> upstream/cm-10.2[/COLOR]
mRecordsRequested = true;

While it's certainly not always this straight forward, it looks like in this case, all you need to do to resolve the conflict is delete those merge conflict reference points highlighted in blue above (delete the line itself too, not just the stuff on that line) and delete the line with the problem code highlighted in red above. Then save the file.

(In this particular case, it's more than likely that for every file, you'll just want to delete everything between "<<<<<<< HEAD" and "=======" and keep everything between "=======" and ">>>>>>> upstream/cm-10.2")

After you resolve the conflicts in all of those files listed, then run:

git add -A
git commit -a

and since the merge will have created the commit message for you already, just hit Ctrl+X to exit the commit message. You should then see something like:

[jb43 00e3138] Merge remote-tracking branch 'upstream/cm-10.2' into jb43