diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:08:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:08:12 -0700 |
| commit | e7867e80f00bf54634a2e15abd762ac615c5b791 (patch) | |
| tree | a90cbde45e11212a580ee68a21a4023b10beef6f /git-gui/lib/diff.tcl | |
| parent | 62b553cdd6cd41d60b3e0c6fe4a85a951712df97 (diff) | |
| parent | 95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca (diff) | |
| download | git-e7867e80f00bf54634a2e15abd762ac615c5b791.tar.gz git-e7867e80f00bf54634a2e15abd762ac615c5b791.tar.xz | |
Merge branch 'so/rebase-doc' into maint
* so/rebase-doc:
Documentation/git-rebase.txt: <upstream> must be given to specify <branch>
Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions