summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2015-08-19Merge branch 'jk/git-path'Junio C Hamano9-69/+84
2015-08-19Merge branch 'jc/finalize-temp-file'Junio C Hamano1-2/+2
2015-08-19Merge branch 'ps/guess-repo-name-at-root'Junio C Hamano1-10/+52
2015-08-19Merge branch 'jk/guess-repo-name-regression-fix'Junio C Hamano1-1/+2
2015-08-19Merge branch 'sb/remove-unused-var-from-builtin-add' into maintJunio C Hamano1-2/+0
2015-08-19Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano1-26/+29
2015-08-19Merge branch 'db/send-pack-user-signingkey' into maintJunio C Hamano1-0/+3
2015-08-19Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintJunio C Hamano1-1/+1
2015-08-19push: add a config option push.gpgSign for default signed pushesDave Borowitz2-15/+62
2015-08-19push: support signing pushes iff the server supports itDave Borowitz2-3/+23
2015-08-19builtin/send-pack.c: use parse_options APIDave Borowitz1-104/+59
2015-08-19Merge 'hv/submodule-config' to 'sb/submodule-helper'Junio C Hamano2-0/+2
2015-08-19submodule: allow erroneous values for the fetchRecurseSubmodules optionHeiko Voigt1-0/+1
2015-08-19submodule: use new config API for worktree configurationsHeiko Voigt1-0/+1
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan1-13/+36
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller1-1/+13
2015-08-17notes: add notes.mergeStrategy option to select default strategyJacob Keller1-2/+17
2015-08-17notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller1-11/+1
2015-08-17Merge branch 'mh/get-remote-group-fix'Junio C Hamano1-8/+6
2015-08-17Merge branch 'kd/pull-rebase-autostash'Junio C Hamano1-1/+5
2015-08-17prepare_packed_git(): refactor garbage reporting in pack directoryJunio C Hamano1-2/+24
2015-08-12gc: use tempfile module to handle gc.pid fileMichael Haggerty1-20/+5
2015-08-12lock_repo_for_gc(): compute the path to "gc.pid" only onceMichael Haggerty1-3/+6
2015-08-12Merge branch 'sb/remove-unused-var-from-builtin-add'Junio C Hamano1-2/+0
2015-08-12Merge branch 'es/worktree-add-cleanup'Junio C Hamano2-115/+88
2015-08-12Merge branch 'pt/am-builtin'Junio C Hamano1-0/+2321
2015-08-12Merge branch 'es/worktree-add'Junio C Hamano1-1/+1
2015-08-12am: let --signoff override --no-signoffPaul Tan1-3/+25
2015-08-12am: let command-line options override saved optionsPaul Tan1-4/+12
2015-08-11notes: handle multiple worktreesDavid Turner1-0/+6
2015-08-10memoize common git-path "constant" filesJeff King5-38/+37
2015-08-10get_repo_path: refactor path-allocationJeff King1-14/+29
2015-08-10remote.c: drop extraneous local variable from migrate_fileJeff King1-5/+2
2015-08-10prefer mkpathdup to mkpath in assignmentsJeff King1-11/+13
2015-08-10prefer git_pathdup to git_path in some possibly-dangerous casesJeff King1-1/+3
2015-08-10lockfile: add accessor get_lock_file_path()Michael Haggerty1-7/+8
2015-08-10sha1_file.c: rename move_temp_to_file() to finalize_object_file()Junio C Hamano1-2/+2
2015-08-10clone: abort if no dir name could be guessedPatrick Steinhardt1-0/+4
2015-08-10clone: do not use port number as dir namePatrick Steinhardt1-0/+17
2015-08-10clone: do not include authentication data in guessed dirPatrick Steinhardt1-10/+31
2015-08-10clone: use computed length in guess_dir_nameJeff King1-1/+2
2015-08-10config: add '--name-only' option to list only variable namesSZEDER Gábor1-2/+12
2015-08-04git-am: add am.threeWay config variableRemi Lespinet1-0/+2
2015-08-04builtin-am: remove redirection to git-am.shPaul Tan1-15/+0
2015-08-04builtin-am: check for valid committer identPaul Tan1-0/+3
2015-08-04builtin-am: implement legacy -b/--binary optionPaul Tan1-0/+7
2015-08-04builtin-am: implement -i/--interactivePaul Tan1-1/+104
2015-08-04builtin-am: support and auto-detect mercurial patchesPaul Tan1-1/+73
2015-08-04builtin-am: support and auto-detect StGit series filesPaul Tan1-1/+58
2015-08-04builtin-am: support and auto-detect StGit patchesPaul Tan1-1/+131