diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-11-11 10:52:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 10:52:59 -0800 |
| commit | 631ba3090714a9786457dd39da8ed50925715432 (patch) | |
| tree | 3119b68e566c36f5a137d8dbbe217892418eb1d3 /Documentation/git-merge-index.txt | |
| parent | RPM: arch submodule needs tla. (diff) | |
| parent | t1200: use --topo-order to keep the show-branch output stable. (diff) | |
| parent | Add test case for merge-base. (diff) | |
| download | tgif-631ba3090714a9786457dd39da8ed50925715432.tar.xz | |
Merge branches 'jc/sb' and 'jc/mb'