summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-05-22Merge branch 'jk/stripspace-asciidoctor-fix'Libravatar Junio C Hamano1-3/+3
2015-05-22Merge branch 'ja/tutorial-asciidoctor-fix'Libravatar Junio C Hamano1-1/+1
2015-05-22Merge branch 'sg/help-subcommands'Libravatar Junio C Hamano1-5/+5
2015-05-22Merge branch 'ps/bundle-verify-arg'Libravatar Junio C Hamano1-0/+8
2015-05-22Merge branch 'ls/http-ssl-cipher-list'Libravatar Junio C Hamano3-0/+24
2015-05-22Merge branch 'dl/subtree-avoid-tricky-echo'Libravatar Junio C Hamano1-3/+10
2015-05-22Merge branch 'jk/skip-http-tests-under-no-curl'Libravatar Junio C Hamano8-35/+13
2015-05-22Merge branch 'dl/subtree-push-no-squash'Libravatar Junio C Hamano2-2/+2
2015-05-22Merge branch 'sg/completion-omit-credential-helpers'Libravatar Junio C Hamano1-2/+2
2015-05-22Merge branch 'dl/branch-error-message'Libravatar Junio C Hamano1-3/+3
2015-05-22for-each-ref: accept "%(push)" formatLibravatar Jeff King3-3/+33
2015-05-22for-each-ref: use skip_prefix instead of starts_withLibravatar Jeff King1-2/+4
2015-05-22sha1_name: implement @{push} shorthandLibravatar Jeff King3-1/+101
2015-05-22sha1_name: refactor interpret_upstream_markLibravatar Jeff King1-21/+23
2015-05-22sha1_name: refactor upstream_markLibravatar Jeff King1-3/+9
2015-05-22remote.c: add branch_get_pushLibravatar Jeff King2-0/+95
2015-05-22remote.c: return upstream name from stat_tracking_infoLibravatar Jeff King5-44/+32
2015-05-22remote.c: untangle error logic in branch_get_upstreamLibravatar Jeff King1-6/+13
2015-05-22test_bitmap_walk: free bitmap with bitmap_freeLibravatar Jeff King1-1/+1
2015-05-22doc: fix inconsistent spelling of "packfile"Libravatar Patrick Steinhardt2-3/+3
2015-05-22t5407: use <<- to align the expected outputLibravatar Junio C Hamano1-40/+40
2015-05-22rebase -i: fix post-rewrite hook with failed exec commandLibravatar Matthieu Moy2-6/+6
2015-05-22rebase -i: demonstrate incorrect behavior of post-rewriteLibravatar Matthieu Moy1-0/+17
2015-05-21config.txt: clarify allowTipSHA1InWant with camelCaseLibravatar Fredrik Medley1-2/+2
2015-05-21help: respect new common command groupingLibravatar Sébastien Guimmara1-1/+23
2015-05-21command-list.txt: drop the "common" tagLibravatar Sébastien Guimmara1-21/+21
2015-05-21generate-cmdlist: parse common group commandsLibravatar Eric Sunshine3-25/+52
2015-05-21command-list.txt: add the common groups blockLibravatar Sébastien Guimmara2-21/+33
2015-05-21command-list: prepare machinery for upcoming "common groups" sectionLibravatar Eric Sunshine3-3/+8
2015-05-21remote.c: report specific errors from branch_get_upstreamLibravatar Jeff King7-30/+48
2015-05-21remote.c: introduce branch_get_upstream helperLibravatar Jeff King5-16/+23
2015-05-21remote.c: hoist read_config into remote_get_1Libravatar Jeff King1-2/+2
2015-05-21remote.c: provide per-branch pushremote nameLibravatar Jeff King2-18/+24
2015-05-21remote.c: hoist branch.*.remote lookup out of remote_get_1Libravatar Jeff King2-7/+15
2015-05-21remote.c: drop "remote" pointer from "struct branch"Libravatar Jeff King4-9/+5
2015-05-21remote.c: refactor setup of branch->merge listLibravatar Jeff King1-4/+15
2015-05-20Documentation/log: clarify sha1 non-abbreviation in log --rawLibravatar Matthieu Moy1-1/+4
2015-05-20dir: remove unused variable sbLibravatar René Scharfe1-2/+0
2015-05-20clean: remove unused variable bufLibravatar René Scharfe1-2/+0
2015-05-20use file_exists() to check if a file exists in the worktreeLibravatar René Scharfe5-22/+9
2015-05-20stash: recognize "--help" for subcommandsLibravatar Jeff King1-0/+11
2015-05-20stash: complain about unknown flagsLibravatar Jeff King2-1/+9
2015-05-20cat-file: add --follow-symlinks to --batchLibravatar David Turner3-7/+348
2015-05-20sha1_name: get_sha1_with_context learns to follow symlinksLibravatar David Turner2-12/+28
2015-05-20tree-walk: learn get_tree_entry_follow_symlinksLibravatar David Turner2-0/+224
2015-05-20mergetools: add winmerge as a builtin toolLibravatar David Aguilar1-0/+36
2015-05-20mergetool--lib: set IFS for difftool and mergetoolLibravatar David Aguilar2-2/+3
2015-05-20t5551: factor out tag creationLibravatar Jeff King1-13/+21
2015-05-20filter_buffer_or_fd(): ignore EPIPELibravatar Junio C Hamano2-1/+16
2015-05-19Documentation/git-commit: grammofixLibravatar Michael Coleman1-1/+1