summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-07-11 05:52:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-11 21:16:53 (GMT)
commite1447e38c00bdc1904458cfabb4bb3ffb678a271 (patch)
tree230bb5db31b1bb9ba3226fe2aa8911205df3ded2 /git-pull.sh
parented0e078f96a96ffe515899ef42051a568be4693a (diff)
downloadgit-e1447e38c00bdc1904458cfabb4bb3ffb678a271.zip
git-e1447e38c00bdc1904458cfabb4bb3ffb678a271.tar.gz
git-e1447e38c00bdc1904458cfabb4bb3ffb678a271.tar.bz2
Log ref changes made by git-merge and git-pull.
When git-merge updates HEAD as a result of a merge record what happened during the merge into the reflog associated with HEAD (if any). The log reports who caused the update (git-merge or git-pull, by invoking git-merge), what the remote ref names were and the type of merge process used. The merge information can be useful when reviewing a reflog for a branch such as `master` where fast forward and trivial in index merges might be common as the user tracks an upstream. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index d337bf4..f380437 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -102,5 +102,6 @@ case "$strategy_args" in
esac
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
-git-merge $no_summary $no_commit $squash $strategy_args \
+git-merge "--reflog-action=pull $*" \
+ $no_summary $no_commit $squash $strategy_args \
"$merge_name" HEAD $merge_head