diff options
| author |  Xue Fuqiao <xfq.free@gmail.com> | 2015-10-25 08:28:43 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-10-26 13:03:44 -0700 |
| commit | b2af4829cc51fc90885948f19f24b76f2670a677 (patch) | |
| tree | dacae002ae40c7606062165a5d4f2887286f56dd /Documentation/technical/trivial-merge.txt | |
| parent | Merge branch 'maint-1.9' into maint-2.0 (diff) | |
| download | tgif-b2af4829cc51fc90885948f19f24b76f2670a677.tar.xz | |
user-manual: fix the description of fast-forward
The "Fast-forward merges" section of user-manual.txt incorrectly
says if the current branch is a descendant of the other, Git will
perform a fast-forward merge, but it should the other way around.
Signed-off-by: Xue Fuqiao <xfq.free@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions