diff options
author | Junio C Hamano <junkio@cox.net> | 2006-11-09 15:08:19 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-11-09 15:08:19 -0800 |
commit | 368c2ac249ac2261784e1b9b9bc7c98c5e859052 (patch) | |
tree | 6576c6616785ebad6d6dc4a296f4baaf691254f8 /diff.c | |
parent | Documentation: move blame examples (diff) | |
parent | git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch. (diff) | |
download | tgif-368c2ac249ac2261784e1b9b9bc7c98c5e859052.tar.xz |
Merge branch 'maint'
* maint:
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
git-svn: fix dcommit losing changes when out-of-date from svn
git-svn: don't die on rebuild when --upgrade is specified
git-svn: avoid printing filenames of files we're not tracking
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions