diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-23 23:52:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-23 23:52:42 -0800 |
| commit | 88d9405600ece221306ac98db68c6bf756e1ff09 (patch) | |
| tree | 68ec7c90369cbf6a9ddbff76e2e574ab0f782793 /git-merge-ours.sh | |
| parent | Merge branch 'jc/pull' into next (diff) | |
| parent | sha1_name: make core.warnambiguousrefs the default. (diff) | |
| download | tgif-88d9405600ece221306ac98db68c6bf756e1ff09.tar.xz | |
Merge branch 'jc/name' into next
* jc/name:
sha1_name: make core.warnambiguousrefs the default.
sha1_name: warning ambiguous refs.
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions