| commit | 7ae52d44e4ada901dc6dc578a895edf17114a51e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2015 21:20:43 +0000 (26 14:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2015 21:20:44 +0000 (26 14:20 -0700) | ||
| tree | 8c134dc3e4f7af29f20bbcbfebe7953eb5ab16c9 | treesnapshot (tar.gz zip) |
| parent | 9d5aee4293a0f155ab10a571a77e21ff262daf63 | commitdiff |
| parent | 122d53464b29d3ac20891c5ee2f75ac5ecbb7b20 | commitdiff |
Merge branch 'dt/cat-file-follow-symlinks' into next
"git cat-file --batch(-check)" learned the "--follow-symlinks"
option that follows an in-tree symbolic links when asked about an
object via extended SHA-1 syntax, e.g. HEAD:RelNotes that points at
Documentation/RelNotes/2.5.0.txt. With the new option, the command
behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as
input instead.
* dt/cat-file-follow-symlinks:
cat-file: add --follow-symlinks to --batch
sha1_name: get_sha1_with_context learns to follow symlinks
tree-walk: learn get_tree_entry_follow_symlinks
"git cat-file --batch(-check)" learned the "--follow-symlinks"
option that follows an in-tree symbolic links when asked about an
object via extended SHA-1 syntax, e.g. HEAD:RelNotes that points at
Documentation/RelNotes/2.5.0.txt. With the new option, the command
behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as
input instead.
* dt/cat-file-follow-symlinks:
cat-file: add --follow-symlinks to --batch
sha1_name: get_sha1_with_context learns to follow symlinks
tree-walk: learn get_tree_entry_follow_symlinks