summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2016-08-12Merge branch 'rs/merge-add-strategies-simplification'Libravatar Junio C Hamano1-34/+10
2016-08-12Merge branch 'rs/child-process-init'Libravatar Junio C Hamano2-6/+3
2016-08-12Merge branch 'sb/submodule-clone-retry'Libravatar Junio C Hamano1-2/+6
2016-08-10Merge branch 'sb/submodule-update-dot-branch'Libravatar Junio C Hamano1-2/+54
2016-08-10Merge branch 'js/am-3-merge-recursive-direct'Libravatar Junio C Hamano5-43/+31
2016-08-10Merge branch 'js/commit-slab-decl-fix'Libravatar Junio C Hamano1-1/+0
2016-08-10Merge branch 'jt/format-patch-from-config'Libravatar Junio C Hamano1-1/+12
2016-08-10Merge branch 'jk/reset-ident-time-per-commit'Libravatar Junio C Hamano1-0/+2
2016-08-09submodule--helper: use parallel processor correctlyLibravatar Stefan Beller1-2/+6
2016-08-09config.c: avoid duplicated global static variablesLibravatar Johannes Sixt1-1/+0
2016-08-08Merge branch 'jk/parseopt-string-list'Libravatar Junio C Hamano1-1/+1
2016-08-08Merge branch 'rs/use-strbuf-addstr'Libravatar Junio C Hamano2-2/+2
2016-08-08Merge branch 'jk/pack-objects-optim'Libravatar Junio C Hamano1-0/+40
2016-08-08Merge branch 'va/i18n'Libravatar Junio C Hamano1-2/+3
2016-08-08Merge branch 'jk/reflog-date'Libravatar Junio C Hamano1-0/+3
2016-08-05merge: use string_list_split() in add_strategies()Libravatar René Scharfe1-34/+10
2016-08-05use CHILD_PROCESS_INIT to initialize automatic variablesLibravatar René Scharfe2-6/+3
2016-08-05use strbuf_addstr() instead of strbuf_addf() with "%s"Libravatar René Scharfe1-1/+1
2016-08-04Merge branch 'sb/submodule-clone-retry'Libravatar Junio C Hamano1-1/+1
2016-08-03submodule update: allow '.' for branch valueLibravatar Stefan Beller1-0/+18
2016-08-03submodule--helper: add remote-branch helperLibravatar Stefan Beller1-1/+35
2016-08-03Merge branch 'jk/push-progress'Libravatar Junio C Hamano5-17/+128
2016-08-03Merge branch 'jk/parse-options-concat'Libravatar Junio C Hamano1-9/+4
2016-08-03Merge branch 'sb/push-options'Libravatar Junio C Hamano2-16/+82
2016-08-03Merge branch 'os/no-verify-skips-commit-msg-too'Libravatar Junio C Hamano1-1/+1
2016-08-03blame: drop strdup of string literalLibravatar Eric Sunshine1-1/+1
2016-08-01am: reset cached ident date for each patchLibravatar Jeff King1-0/+2
2016-08-01submodule--helper: fix usage string for relative-pathLibravatar Stefan Beller1-1/+1
2016-08-01use strbuf_addstr() for adding constant strings to a strbufLibravatar René Scharfe1-1/+1
2016-08-01format-patch: format.from gives the default for --fromLibravatar Josh Triplett1-1/+12
2016-08-01merge_trees(): ensure that the callers release output bufferLibravatar Johannes Schindelin1-0/+1
2016-07-29pack-objects: compute local/ignore_pack_keep earlyLibravatar Jeff King1-1/+25
2016-07-29pack-objects: break out of want_object loop earlyLibravatar Jeff King1-0/+16
2016-07-28Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintLibravatar Junio C Hamano1-4/+3
2016-07-28Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintLibravatar Junio C Hamano1-8/+8
2016-07-28Merge branch 'ew/gc-auto-pack-limit-fix' into maintLibravatar Junio C Hamano1-1/+1
2016-07-28Merge branch 'nd/ita-cleanup' into maintLibravatar Junio C Hamano1-2/+2
2016-07-28Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintLibravatar Junio C Hamano2-2/+2
2016-07-28Merge branch 'nd/pack-ofs-4gb-limit'Libravatar Junio C Hamano4-21/+27
2016-07-28Merge branch 'nd/worktree-lock'Libravatar Junio C Hamano1-0/+66
2016-07-28i18n: notes: mark comment for translationLibravatar Vasco Almeida1-2/+3
2016-07-27date: add "unix" formatLibravatar Jeff King1-0/+3
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-26prepare the builtins for a libified merge_recursive()Libravatar Johannes Schindelin2-1/+5
2016-07-26die("bug"): report bugs consistentlyLibravatar Johannes Schindelin2-2/+3
2016-07-25Merge branch 'mh/blame-worktree'Libravatar Junio C Hamano1-1/+9
2016-07-25Merge branch 'js/fsck-name-object'Libravatar Junio C Hamano1-18/+62
2016-07-25Merge branch 'rs/rm-strbuf-optim'Libravatar Junio C Hamano1-2/+3
2016-07-25Merge branch 'mh/ref-iterators'Libravatar Junio C Hamano2-7/+3