summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-23 22:30:08 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-23 22:30:08 -0800
commite61f25f3a6bb5dcbb5ae5f8b4ad26c308982373c (patch)
tree2add4512857b856b31b35f2b827975c3d916ff63 /merge-index.c
parent2a971012b6be236c46cab7212239d70d92b02715 (diff)
parentd21fc9342cd82bb48bfbf9f54024ae2d4e16a9a3 (diff)
downloadgit-e61f25f3a6bb5dcbb5ae5f8b4ad26c308982373c.tar.gz
Merge branch 'jc/log-stdin'
* jc/log-stdin: Add trivial tests for --stdin option to log family Make --stdin option to "log" family read also pathspecs setup_revisions(): do not call get_pathspec() too early Teach --stdin option to "log" family read_revision_from_stdin(): use strbuf Conflicts: revision.c
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions