diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-18 22:08:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-18 22:08:31 -0700 |
| commit | a420585f3896c86a8641a0d46483acd2036cb5a3 (patch) | |
| tree | c8bc056db2a77b2a7f236b71289c7b67e40d6773 /diff.c | |
| parent | a4c6ae5a76f6f18876be69e5c1684f425e04bfc1 (diff) | |
| parent | b758789c202dc491555b698149afe4d4941f7cd5 (diff) | |
| download | git-a420585f3896c86a8641a0d46483acd2036cb5a3.tar.xz | |
Merge branch 'rs/rebase'
* rs/rebase:
git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions