summaryrefslogtreecommitdiffstats
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-17 10:08:11 +0200
committerJunio C Hamano <junkio@cox.net>2006-07-17 10:08:11 +0200
commitb9718d41c7e9c171e432bafac97a33be36f0e2bf (patch)
tree22f2ceb1019de1fa335e4f31f5fa61f84b231f13 /builtin-diff.c
parentgit-svn: don't check for migrations/upgrades on commit-diff (diff)
parentRecord rebase changes as 'rebase' in the reflog. (diff)
downloadgit-b9718d41c7e9c171e432bafac97a33be36f0e2bf.tar.xz
git-b9718d41c7e9c171e432bafac97a33be36f0e2bf.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 'builtin-diff.c')
0 files changed, 0 insertions, 0 deletions