summaryrefslogtreecommitdiff
path: root/builtin-add.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-17 18:55:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-17 18:55:06 -0700
commitca8a36e6e0cf6ee952df16160bc853630c56b997 (patch)
treea7a0cc36a4aac48173264e8d84dbe4ba1dcd7fad /builtin-add.c
parentMerge branch 'tr/maint-1.6.0-send-email-irt' (diff)
parentbuiltin-remote.c: no "commented out" code, please (diff)
downloadtgif-ca8a36e6e0cf6ee952df16160bc853630c56b997.tar.xz
Merge branch 'js/remote-improvements'
* js/remote-improvements: (23 commits) builtin-remote.c: no "commented out" code, please builtin-remote: new show output style for push refspecs builtin-remote: new show output style remote: make guess_remote_head() use exact HEAD lookup if it is available builtin-remote: add set-head subcommand builtin-remote: teach show to display remote HEAD builtin-remote: fix two inconsistencies in the output of "show <remote>" builtin-remote: make get_remote_ref_states() always populate states.tracked builtin-remote: rename variables and eliminate redundant function call builtin-remote: remove unused code in get_ref_states builtin-remote: refactor duplicated cleanup code string-list: new for_each_string_list() function remote: make match_refs() not short-circuit remote: make match_refs() copy src ref before assigning to peer_ref remote: let guess_remote_head() optionally return all matches remote: make copy_ref() perform a deep copy remote: simplify guess_remote_head() move locate_head() to remote.c move duplicated ref_newer() to remote.c move duplicated get_local_heads() to remote.c ... Conflicts: builtin-clone.c
Diffstat (limited to 'builtin-add.c')
0 files changed, 0 insertions, 0 deletions