diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:25 -0700 |
| commit | 5fbef463a144fdb84a5b211e87d1d4bf67d61d4a (patch) | |
| tree | aa8c65b1f79aaa66c779c1f48a71b20a6fedad15 /git-merge-octopus.sh | |
| parent | 7a95d1be03d3fdd571bd36ea5b8bc5c59b063249 (diff) | |
| parent | 1f1f575ebe194d2711f70bf7fc4e1ad9ae136112 (diff) | |
| download | git-5fbef463a144fdb84a5b211e87d1d4bf67d61d4a.tar.gz git-5fbef463a144fdb84a5b211e87d1d4bf67d61d4a.tar.xz | |
Merge branch 'mg/maint-doc-sparse-checkout'
* mg/maint-doc-sparse-checkout:
git-read-tree.txt: correct sparse-checkout and skip-worktree description
git-read-tree.txt: language and typography fixes
unpack-trees: print "Aborting" to stderr
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions