diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:17 -0700 |
| commit | 96ec83ce5207be0aac3c1df1ac92356f9de9ad81 (patch) | |
| tree | 2fd2924a0023333772153f04fe654fbd8641e5b3 /git-gui/lib/encoding.tcl | |
| parent | a5406125cc3989a7007d4fad7e5757cdb9837ebf (diff) | |
| parent | 4f21454b55f4237b7d0487ad5099c9edf4fc3967 (diff) | |
| download | git-96ec83ce5207be0aac3c1df1ac92356f9de9ad81.tar.gz git-96ec83ce5207be0aac3c1df1ac92356f9de9ad81.tar.xz | |
Merge branch 'jk/merge-base-fork-point-without-reflog' into maint
"git rebase" immediately after "git clone" failed to find the fork
point from the upstream.
* jk/merge-base-fork-point-without-reflog:
merge-base: handle --fork-point without reflog
Diffstat (limited to 'git-gui/lib/encoding.tcl')
0 files changed, 0 insertions, 0 deletions