diff options
| author |  Shawn Pearce <spearce@spearce.org> | 2006-07-11 01:52:54 -0400 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-07-11 14:16:53 -0700 |
| commit | e1447e38c00bdc1904458cfabb4bb3ffb678a271 (patch) | |
| tree | 230bb5db31b1bb9ba3226fe2aa8911205df3ded2 /xdiff/xprepare.c | |
| parent | git-fetch: fix a bashism (==) (diff) | |
| download | tgif-e1447e38c00bdc1904458cfabb4bb3ffb678a271.tar.xz | |
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 'xdiff/xprepare.c')
0 files changed, 0 insertions, 0 deletions