summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-07-02merge: handle --ff/--no-ff/--ff-only as a tri-state optionLibravatar Miklos Vajna2-25/+42
2013-06-30Merge branch 'maint'Libravatar Junio C Hamano3-3/+14
2013-06-30Update draft release notes to 1.8.4Libravatar Junio C Hamano1-0/+23
2013-06-30Merge branch 'mh/ref-races'Libravatar Junio C Hamano6-134/+466
2013-06-30Merge branch 'ap/diff-ignore-blank-lines'Libravatar Junio C Hamano10-8/+439
2013-06-30Merge branch 'mh/loose-refs-race-with-pack-ref'Libravatar Junio C Hamano1-34/+72
2013-06-30Merge branch 'nk/name-rev-abbreviated-refs'Libravatar Junio C Hamano2-8/+31
2013-06-30Merge branch 'jk/submodule-subdirectory-ok'Libravatar Junio C Hamano9-213/+673
2013-06-30Start preparing for 1.8.3.3Libravatar Junio C Hamano2-1/+12
2013-06-30Merge branch 'fc/macos-x-clipped-write' into maintLibravatar Junio C Hamano4-0/+27
2013-06-30Merge branch 'da/darwin' into maintLibravatar Junio C Hamano2-0/+25
2013-06-30check-ignore doc: fix broken link to ls-files pageLibravatar Ramkumar Ramachandra1-1/+1
2013-06-30test: spell 'ls-files --delete' option correctly in test descriptionsLibravatar SZEDER Gábor1-2/+2
2013-06-28Sync with 1.8.3.2Libravatar Junio C Hamano3-2/+8
2013-06-28Git 1.8.3.2Libravatar Junio C Hamano3-2/+8
2013-06-28configure: fix option help message for --disable-pthreadsLibravatar Stefano Lattarini1-1/+1
2013-06-28Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintLibravatar Junio C Hamano6-38/+97
2013-06-27Merge branch 'maint'Libravatar Junio C Hamano1-0/+54
2013-06-27Start preparing for 1.8.3.2Libravatar Junio C Hamano2-1/+55
2013-06-27Merge branch 'ks/difftool-dir-diff-copy-fix' into maintLibravatar Junio C Hamano2-7/+21
2013-06-27Merge branch 'rr/push-head' into maintLibravatar Junio C Hamano1-7/+14
2013-06-27Merge branch 'fc/show-branch-in-rebase-am' into maintLibravatar Junio C Hamano2-1/+3
2013-06-27Merge branch 'tg/maint-zsh-svn-remote-prompt' into maintLibravatar Junio C Hamano1-3/+4
2013-06-27Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maintLibravatar Junio C Hamano1-1/+1
2013-06-27Merge branch 'tr/push-no-verify-doc' into maintLibravatar Junio C Hamano1-1/+6
2013-06-27Merge branch 'rs/commit-m-no-edit' into maintLibravatar Junio C Hamano2-4/+23
2013-06-27Merge branch 'jc/strbuf-branchname-fix' into maintLibravatar Junio C Hamano2-4/+19
2013-06-27Merge branch 'mk/combine-diff-context-horizon-fix' into maintLibravatar Junio C Hamano2-2/+53
2013-06-27Merge branch 'kb/ancestry-path-threedots' into maintLibravatar Junio C Hamano3-1/+38
2013-06-27Merge branch 'jk/subtree-do-not-push-if-split-fails' into maintLibravatar Junio C Hamano1-1/+2
2013-06-27Merge branch 'mh/fetch-into-shallow' into maintLibravatar Junio C Hamano3-3/+16
2013-06-27Merge branch 'jh/checkout-auto-tracking' into maintLibravatar Junio C Hamano8-35/+221
2013-06-27Update draft release notes to 1.8.4Libravatar Junio C Hamano1-1/+10
2013-06-27Merge branch 'jk/add-i-custom-diff-algo'Libravatar Junio C Hamano1-0/+5
2013-06-27Merge branch 'rr/cherry-pick-fast-forward-reflog-message'Libravatar Junio C Hamano1-3/+8
2013-06-27Merge branch 'mt/send-email-cc-match-fix'Libravatar Junio C Hamano2-2/+17
2013-06-27Merge branch 'jk/pull-into-dirty-unborn'Libravatar Junio C Hamano2-2/+38
2013-06-27Merge branch 'bc/http-keep-memory-given-to-curl'Libravatar Junio C Hamano1-3/+9
2013-06-27Merge branch 'bc/checkout-tracking-name-plug-leak'Libravatar Junio C Hamano2-4/+7
2013-06-27Merge branch 'rr/rebase-stash-store'Libravatar Junio C Hamano4-17/+74
2013-06-26Update draft release notes to 1.8.4Libravatar Junio C Hamano1-0/+12
2013-06-26Merge branch 'tr/maint-apply-non-git-patch-parsefix'Libravatar Junio C Hamano2-1/+15
2013-06-26Merge branch 'ys/cygstart'Libravatar Junio C Hamano2-3/+9
2013-06-26Merge branch 'wk/doc-git-has-grown'Libravatar Junio C Hamano1-3/+3
2013-06-26Merge branch 'vl/typofix'Libravatar Junio C Hamano3-3/+3
2013-06-26Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Libravatar Junio C Hamano9-21/+20
2013-06-26Merge branch 'mm/merge-in-dirty-worktree-doc'Libravatar Junio C Hamano1-2/+2
2013-06-26Merge branch 'kb/diff-blob-blob-doc'Libravatar Junio C Hamano1-7/+7
2013-06-26Merge branch 'mm/push-force-is-dangerous'Libravatar Junio C Hamano1-0/+9
2013-06-26Merge branch 'fg/submodule-non-ascii-path'Libravatar Junio C Hamano2-1/+17