diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-10-02 11:13:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-02 11:13:44 -0700 |
| commit | f9d72413bcbf33ced45f12e17ef156abd73963f6 (patch) | |
| tree | 86dba3737d5e0b583d7438c927db9e95b632ab68 /Documentation/git-merge.txt | |
| parent | read-tree: --trivial (diff) | |
| download | tgif-f9d72413bcbf33ced45f12e17ef156abd73963f6.tar.xz | |
Handle really trivial case inside git-merge.
Using Linus' --trivial option, this handles really trivial case
inside git-merge itself, without using any strategy modules.
A 'really trivial case' is:
- we are merging one branch into the current branch;
- there is only one merge base between the branches;
- there is no file-level merge required.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions