diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-08-05 17:55:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-05 17:55:52 -0700 |
| commit | a2c3db8d224554f7cf995ae8403a0f081432cbae (patch) | |
| tree | 4486e599ae0460fd731f846f6dbf990e8107a20f /git-merge-ours.sh | |
| parent | Fix install-doc-quick target (diff) | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-a2c3db8d224554f7cf995ae8403a0f081432cbae.tar.xz | |
Merge branch 'master' of git://linux-nfs.org/~bfields/git
* 'master' of git://linux-nfs.org/~bfields/git:
documentation: use the word "index" in the git-add manual page
user-manual: mention git-gui
user-manual: mention git stash
user-manual: update for new default --track behavior
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions