diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-18 23:56:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-18 23:56:01 -0800 |
| commit | 154c7d0759b6885034bffa7a34d464d703fc8bb3 (patch) | |
| tree | 9a53213c3c9d39643d7451cb57316935eb634f5f /Documentation/git-merge-index.txt | |
| parent | GIT 1.5.3.6 (diff) | |
| parent | Documentation: Fix references to deprecated commands (diff) | |
| download | tgif-154c7d0759b6885034bffa7a34d464d703fc8bb3.tar.xz | |
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
* 'maint' of git://linux-nfs.org/~bfields/git:
Documentation: Fix references to deprecated commands
user-manual: mention "..." in "Generating diffs", etc.
user-manual: Add section "Why bisecting merge commits can be harder ..."
git-remote.txt: fix example url
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions