path: root/git-pull-script
diff options
authorLinus Torvalds <>2005-06-21 21:04:13 (GMT)
committerLinus Torvalds <>2005-06-21 21:04:13 (GMT)
commit6b38a402e97274037982a5346ca4168cc8ee026c (patch)
treedf65bb53e13bac7ef13375fa5f067d14f96e4532 /git-pull-script
parentd565b3412a0242e2c729bd77d18c74ecd57184dc (diff)
Clean up different special *HEAD handling
We codify the following different heads (in addition to the main "HEAD", which points to the current branch, of course): - FETCH_HEAD Populated by "git fetch" - ORIG_HEAD The old HEAD before a "git pull/resolve" (successful or not) - LAST_MERGE The HEAD we're currently merging in "git pull/resolve" - MERGE_HEAD The previous head of a unresolved "git pull", which gets committed by a "git commit" after manually resolving the result We used to have "MERGE_HEAD" be populated directly by the fetch, and we removed ORIG_HEAD and LAST_MERGE too aggressively.
Diffstat (limited to 'git-pull-script')
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script
index dbef56c..90ee0f3 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -17,5 +17,5 @@ git-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
- "$(cat "$GIT_DIR"/MERGE_HEAD)" \
+ "$(cat "$GIT_DIR"/FETCH_HEAD)" \