summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexLibravatar Paul Tan1-13/+36
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionLibravatar Jacob Keller1-1/+13
2015-08-17notes: add notes.mergeStrategy option to select default strategyLibravatar Jacob Keller1-2/+17
2015-08-17notes: extract parse_notes_merge_strategy to notes-utilsLibravatar Jacob Keller1-11/+1
2015-08-17Merge branch 'mh/get-remote-group-fix'Libravatar Junio C Hamano1-8/+6
2015-08-17Merge branch 'kd/pull-rebase-autostash'Libravatar Junio C Hamano1-1/+5
2015-08-12gc: use tempfile module to handle gc.pid fileLibravatar Michael Haggerty1-20/+5
2015-08-12lock_repo_for_gc(): compute the path to "gc.pid" only onceLibravatar Michael Haggerty1-3/+6
2015-08-12Merge branch 'sb/remove-unused-var-from-builtin-add'Libravatar Junio C Hamano1-2/+0
2015-08-12Merge branch 'es/worktree-add-cleanup'Libravatar Junio C Hamano2-116/+89
2015-08-12Merge branch 'pt/am-builtin'Libravatar Junio C Hamano1-0/+2321
2015-08-12Merge branch 'es/worktree-add'Libravatar Junio C Hamano1-1/+1
2015-08-12am: let --signoff override --no-signoffLibravatar Paul Tan1-3/+25
2015-08-12am: let command-line options override saved optionsLibravatar Paul Tan1-4/+12
2015-08-11notes: handle multiple worktreesLibravatar David Turner1-0/+6
2015-08-10memoize common git-path "constant" filesLibravatar Jeff King5-38/+37
2015-08-10get_repo_path: refactor path-allocationLibravatar Jeff King1-14/+29
2015-08-10remote.c: drop extraneous local variable from migrate_fileLibravatar Jeff King1-5/+2
2015-08-10prefer mkpathdup to mkpath in assignmentsLibravatar Jeff King1-11/+13
2015-08-10prefer git_pathdup to git_path in some possibly-dangerous casesLibravatar Jeff King1-1/+3
2015-08-10lockfile: add accessor get_lock_file_path()Libravatar Michael Haggerty1-7/+8
2015-08-10sha1_file.c: rename move_temp_to_file() to finalize_object_file()Libravatar Junio C Hamano1-2/+2
2015-08-10clone: abort if no dir name could be guessedLibravatar Patrick Steinhardt1-0/+4
2015-08-10clone: do not use port number as dir nameLibravatar Patrick Steinhardt1-0/+17
2015-08-10clone: do not include authentication data in guessed dirLibravatar Patrick Steinhardt1-10/+31
2015-08-10clone: use computed length in guess_dir_nameLibravatar Jeff King1-1/+2
2015-08-10config: add '--name-only' option to list only variable namesLibravatar SZEDER Gábor1-2/+12
2015-08-04git-am: add am.threeWay config variableLibravatar Remi Lespinet1-0/+2
2015-08-04builtin-am: remove redirection to git-am.shLibravatar Paul Tan1-15/+0
2015-08-04builtin-am: check for valid committer identLibravatar Paul Tan1-0/+3
2015-08-04builtin-am: implement legacy -b/--binary optionLibravatar Paul Tan1-0/+7
2015-08-04builtin-am: implement -i/--interactiveLibravatar Paul Tan1-1/+104
2015-08-04builtin-am: support and auto-detect mercurial patchesLibravatar Paul Tan1-1/+73
2015-08-04builtin-am: support and auto-detect StGit series filesLibravatar Paul Tan1-1/+58
2015-08-04builtin-am: support and auto-detect StGit patchesLibravatar Paul Tan1-1/+131
2015-08-04builtin-am: rerere supportLibravatar Paul Tan1-0/+25
2015-08-04builtin-am: invoke post-applypatch hookLibravatar Paul Tan1-0/+2
2015-08-04builtin-am: invoke pre-applypatch hookLibravatar Paul Tan1-0/+3
2015-08-04builtin-am: invoke applypatch-msg hookLibravatar Paul Tan1-0/+24
2015-08-04builtin-am: support automatic notes copyingLibravatar Paul Tan1-0/+60
2015-08-04builtin-am: invoke post-rewrite hookLibravatar Paul Tan1-0/+55
2015-08-04builtin-am: implement -S/--gpg-sign, commit.gpgsignLibravatar Paul Tan1-1/+10
2015-08-04builtin-am: implement --committer-date-is-author-dateLibravatar Paul Tan1-0/+8
2015-08-04builtin-am: implement --ignore-dateLibravatar Paul Tan1-1/+5
2015-08-04builtin-am: pass git-apply's options to git-applyLibravatar Paul Tan1-0/+45
2015-08-04builtin-am: implement --[no-]scissorsLibravatar Paul Tan1-0/+48
2015-08-04builtin-am: support --keep-cr, am.keepcrLibravatar Paul Tan1-6/+23
2015-08-04builtin-am: implement --[no-]message-id, am.messageidLibravatar Paul Tan1-0/+13
2015-08-04builtin-am: implement -k/--keep, --keep-non-patchLibravatar Paul Tan1-0/+50
2015-08-04builtin-am: implement -u/--utf8Libravatar Paul Tan1-0/+11