summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2015-05-19copy.c: make copy_fd() report its status silentlyLibravatar Junio C Hamano3-7/+16
2015-05-19Third batch for 2.5 cycleLibravatar Junio C Hamano1-0/+81
2015-05-19Merge branch 'sb/ref-lock-lose-lock-fd'Libravatar Junio C Hamano1-10/+5
2015-05-19Merge branch 'kn/cat-file-literally'Libravatar Junio C Hamano5-43/+188
2015-05-19Merge branch 'nd/dwim-wildcards-as-pathspecs'Libravatar Junio C Hamano1-1/+3
2015-05-19Merge branch 'jc/merge'Libravatar Junio C Hamano10-112/+324
2015-05-19Merge branch 'ph/rebase-i-redo'Libravatar Junio C Hamano2-0/+63
2015-05-19Merge branch 'jc/test-prereq-validate'Libravatar Junio C Hamano1-0/+9
2015-05-19Merge branch 'bc/connect-plink'Libravatar Junio C Hamano2-22/+67
2015-05-19Merge branch 'jk/test-chain-lint'Libravatar Junio C Hamano2-2/+2
2015-05-19Merge branch 'fg/document-commit-message-stripping'Libravatar Junio C Hamano1-4/+7
2015-05-19Merge branch 'jk/stash-require-clean-index'Libravatar Junio C Hamano2-7/+16
2015-05-19Merge branch 'jk/git-no-more-argv0-path-munging'Libravatar Junio C Hamano1-1/+0
2015-05-19Merge branch 'jc/gitignore-precedence'Libravatar Junio C Hamano2-3/+17
2015-05-19Merge branch 'nd/diff-i-t-a'Libravatar Junio C Hamano4-8/+38
2015-05-19progress: treat "no terminal" as being in the foregroundLibravatar Jeff King1-1/+2
2015-05-19pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsLibravatar René Scharfe1-5/+3
2015-05-19clone: call transport_set_verbosity before anything else on the newly created...Libravatar Mike Hommey1-2/+2
2015-05-18subdirectory tests: code cleanup, uncomment testLibravatar Stefan Beller1-4/+7
2015-05-18clean: only lstat files in pathspecLibravatar David Turner1-3/+3
2015-05-18Documentation/log: clarify what --raw meansLibravatar Matthieu Moy1-1/+10
2015-05-18pull: parse pull.ff as a bool or stringLibravatar Paul Tan1-1/+1
2015-05-18pull: make pull.ff=true override merge.ffLibravatar Paul Tan3-1/+12
2015-05-18pull: handle --log=<n>Libravatar Paul Tan2-2/+19
2015-05-18sha1_file: pass empty buffer to index empty fileLibravatar Jim Hill2-1/+27
2015-05-17pack-protocol.txt: fix insconsistent spelling of "packfile"Libravatar Patrick Steinhardt1-3/+3
2015-05-17git-unpack-objects.txt: fix inconsistent spelling of "packfile"Libravatar Patrick Steinhardt1-2/+2
2015-05-17git-verify-pack.txt: fix inconsistent spelling of "packfile"Libravatar Patrick Steinhardt1-1/+1
2015-05-15http-backend: fix die recursion with custom handlerLibravatar Jeff King1-5/+9
2015-05-14lock_packed_refs(): allow retries when acquiring the packed-refs lockLibravatar Michael Haggerty3-1/+34
2015-05-14lockfile: allow file locking to be retried with a timeoutLibravatar Michael Haggerty2-4/+91
2015-05-14rerere: exit silently on "forget" when rerere is disabledLibravatar Jeff King1-0/+2
2015-05-14pull: remove --tags error in no merge candidates caseLibravatar Paul Tan1-9/+0
2015-05-14doc: convert AsciiDoc {?foo} to ifdef::foo[]Libravatar Jeff King1-2/+6
2015-05-13Sync with 2.4.1Libravatar Junio C Hamano2-1/+42