summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-07-28Merge branch 'jk/test-match-signal' into maintLibravatar Junio C Hamano3-11/+26
2016-07-28Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintLibravatar Junio C Hamano1-8/+8
2016-07-28Merge branch 'js/t3404-grammo-fix' into maintLibravatar Junio C Hamano1-1/+1
2016-07-28Merge branch 'nd/doc-new-command' into maintLibravatar Junio C Hamano1-1/+1
2016-07-28Merge branch 'ew/gc-auto-pack-limit-fix' into maintLibravatar Junio C Hamano1-1/+1
2016-07-28Merge branch 'js/color-on-windows-comment' into maintLibravatar Junio C Hamano1-5/+0
2016-07-28Merge branch 'mm/doc-tt' into maintLibravatar Junio C Hamano62-227/+228
2016-07-28Merge branch 'js/sign-empty-commit-fix' into maintLibravatar Junio C Hamano1-1/+6
2016-07-28Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maintLibravatar Junio C Hamano2-0/+32
2016-07-28Merge branch 'nd/ita-cleanup' into maintLibravatar Junio C Hamano2-3/+61
2016-07-28Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintLibravatar Junio C Hamano7-15/+31
2016-07-28Merge branch 'dg/subtree-rebase-test' into maintLibravatar Junio C Hamano1-0/+119
2016-07-28Merge branch 'sb/submodule-deinit-all'Libravatar Junio C Hamano1-2/+0
2016-07-28Merge branch 'ew/find-perl-on-freebsd-in-local'Libravatar Junio C Hamano1-0/+1
2016-07-28Merge branch 'ew/daemon-socket-keepalive'Libravatar Junio C Hamano2-3/+8
2016-07-28Merge branch 'nd/pack-ofs-4gb-limit'Libravatar Junio C Hamano9-29/+54
2016-07-28Merge branch 'nd/worktree-lock'Libravatar Junio C Hamano6-7/+260
2016-07-28Merge branch 'rs/notes-merge-no-toctou'Libravatar Junio C Hamano1-5/+1
2016-07-28Merge branch 'js/rebase-i-tests'Libravatar Junio C Hamano2-0/+41
2016-07-28i18n: config: unfold error messages marked for translationLibravatar Vasco Almeida3-22/+109
2016-07-28i18n: notes: mark comment for translationLibravatar Vasco Almeida1-2/+3
2016-07-27subtree: adjust function definitions to match CodingGuidelinesLibravatar David Aguilar1-68/+34
2016-07-27subtree: adjust style to match CodingGuidelinesLibravatar David Aguilar1-218/+357
2016-07-27date: clarify --date=raw descriptionLibravatar Junio C Hamano1-1/+5
2016-07-27date: add "unix" formatLibravatar Jeff King5-1/+19
2016-07-27date: document and test "raw-local" modeLibravatar Jeff King2-2/+6
2016-07-27t4205: indent here documentsLibravatar Jeff King1-196/+196
2016-07-27t4205: drop top-level &&-chainingLibravatar Jeff King1-2/+4
2016-07-27completion: add option '--recurse-submodules' to 'git clone'Libravatar Chris Packham1-0/+1
2016-07-26subtree: fix "git subtree split --rejoin"Libravatar David Aguilar2-0/+17
2016-07-26t7900-subtree.sh: fix quoting and broken && chainsLibravatar David Aguilar1-8/+8
2016-07-26submodule deinit: remove outdated commentLibravatar Stefan Beller1-2/+0
2016-07-26push: allow pushing new branches with --force-with-leaseLibravatar John Keeping3-5/+15
2016-07-26push: add shorthand for --force-with-lease branch creationLibravatar John Keeping3-1/+30
2016-07-26commit: describe that --no-verify skips the commit-msg hook in the help textLibravatar Orgad Shaneh1-1/+1
2016-07-26am -3: use merge_recursive() directly againLibravatar Johannes Schindelin1-40/+22
2016-07-26merge-recursive: switch to returning errors instead of dyingLibravatar Johannes Schindelin1-27/+35
2016-07-26merge-recursive: handle return values indicating errorsLibravatar Johannes Schindelin1-102/+150
2016-07-26merge-recursive: allow write_tree_from_memory() to error outLibravatar Johannes Schindelin1-2/+2
2016-07-26merge-recursive: avoid returning a wholesale structLibravatar Johannes Schindelin1-50/+56
2016-07-26merge_recursive: abort properly upon errorsLibravatar Johannes Schindelin1-5/+12
2016-07-26prepare the builtins for a libified merge_recursive()Libravatar Johannes Schindelin3-1/+9
2016-07-26merge-recursive: clarify code in was_tracked()Libravatar Johannes Schindelin1-16/+14
2016-07-26die(_("BUG")): avoid translating bug messagesLibravatar Johannes Schindelin1-3/+3
2016-07-26die("bug"): report bugs consistentlyLibravatar Johannes Schindelin9-21/+21
2016-07-26t5520: verify that `pull --rebase` shows the helpful advice when failingLibravatar Johannes Schindelin1-0/+32
2016-07-26t5510: skip tests under GETTEXT_POISON buildLibravatar Vasco Almeida1-2/+2
2016-07-26config.mak.uname: correct perl path on FreeBSDLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2016-07-25Documentation/git-push: fix placeholder formattingLibravatar John Keeping1-1/+1
2016-07-25Seventh batch of topics for 2.10Libravatar Junio C Hamano1-0/+69