diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:45:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:45:16 -0700 |
| commit | 67f0b6f3b2226ea858c616028375dcc3c46ccc37 (patch) | |
| tree | 598a4db2b8e80916be9c2074490070bdd15e4df4 /merge-recursive.h | |
| parent | Merge branch 'rs/janitorial' (diff) | |
| parent | cat-file: add --follow-symlinks to --batch (diff) | |
| download | tgif-67f0b6f3b2226ea858c616028375dcc3c46ccc37.tar.xz | |
Merge branch 'dt/cat-file-follow-symlinks'
"git cat-file --batch(-check)" learned the "--follow-symlinks"
option that follows an in-tree symbolic link 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
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions