diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-17 01:08:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-17 01:08:11 -0700 |
| commit | b9718d41c7e9c171e432bafac97a33be36f0e2bf (patch) | |
| tree | 22f2ceb1019de1fa335e4f31f5fa61f84b231f13 /git-pull.sh | |
| parent | git-svn: don't check for migrations/upgrades on commit-diff (diff) | |
| parent | Record rebase changes as 'rebase' in the reflog. (diff) | |
| download | git-1.4.2-rc1.tar.gz git-1.4.2-rc1.zip | |
Merge branch 'sp/reflog'v1.4.2-rc1
* sp/reflog:
Record rebase changes as 'rebase' in the reflog.
Log ref changes made by resolve.
Log ref changes made by quiltimport.
Log ref changes made by git-merge and git-pull.
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index d337bf4da3..f380437997 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 |