summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/tempfile'Junio C Hamano2015-08-254-29/+20
|\
| * gc: use tempfile module to handle gc.pid fileMichael Haggerty2015-08-121-20/+5
| * lock_repo_for_gc(): compute the path to "gc.pid" only onceMichael Haggerty2015-08-121-3/+6
| * lockfile: add accessor get_lock_file_path()Michael Haggerty2015-08-101-7/+8
* | Merge branch 'pt/am-builtin-options'Junio C Hamano2015-08-251-6/+36
|\ \
| * | am: let --signoff override --no-signoffpt/am-builtin-optionsPaul Tan2015-08-121-3/+25
| * | am: let command-line options override saved optionsPaul Tan2015-08-121-4/+12
* | | Merge branch 'dt/notes-multiple'Junio C Hamano2015-08-251-0/+6
|\ \ \
| * | | notes: handle multiple worktreesdt/notes-multipleDavid Turner2015-08-111-0/+6
* | | | Merge branch 'jk/git-path'Junio C Hamano2015-08-199-69/+84
|\ \ \ \
| * | | | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-105-38/+37
| * | | | get_repo_path: refactor path-allocationJeff King2015-08-101-14/+29
| * | | | remote.c: drop extraneous local variable from migrate_fileJeff King2015-08-101-5/+2
| * | | | prefer mkpathdup to mkpath in assignmentsJeff King2015-08-101-11/+13
| * | | | prefer git_pathdup to git_path in some possibly-dangerous casesJeff King2015-08-101-1/+3
* | | | | Merge branch 'jc/finalize-temp-file'Junio C Hamano2015-08-191-2/+2
|\ \ \ \ \
| * | | | | sha1_file.c: rename move_temp_to_file() to finalize_object_file()jc/finalize-temp-fileJunio C Hamano2015-08-101-2/+2
* | | | | | Merge branch 'ps/guess-repo-name-at-root'Junio C Hamano2015-08-191-10/+52
|\ \ \ \ \ \
| * | | | | | clone: abort if no dir name could be guessedps/guess-repo-name-at-rootPatrick Steinhardt2015-08-101-0/+4
| * | | | | | clone: do not use port number as dir namePatrick Steinhardt2015-08-101-0/+17
| * | | | | | clone: do not include authentication data in guessed dirPatrick Steinhardt2015-08-101-10/+31
* | | | | | | Merge branch 'jk/guess-repo-name-regression-fix'Junio C Hamano2015-08-191-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | clone: use computed length in guess_dir_namejk/guess-repo-name-regression-fixJeff King2015-08-101-1/+2
* | | | | | | Merge branch 'mh/get-remote-group-fix'Junio C Hamano2015-08-171-8/+6
|\ \ \ \ \ \ \
| * | | | | | | get_remote_group(): use skip_prefix()mh/get-remote-group-fixMichael Haggerty2015-07-281-2/+1
| * | | | | | | get_remote_group(): eliminate superfluous call to strcspn()Michael Haggerty2015-07-281-2/+2
| * | | | | | | get_remote_group(): rename local variable "space" to "wordlen"Michael Haggerty2015-07-281-5/+5
| * | | | | | | get_remote_group(): handle remotes with single-character namesMichael Haggerty2015-07-281-2/+1
* | | | | | | | Merge branch 'kd/pull-rebase-autostash'Junio C Hamano2015-08-171-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | pull: allow dirty tree when rebase.autostash enabledkd/pull-rebase-autostashKevin Daudt2015-07-221-1/+5
* | | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add'Junio C Hamano2015-08-121-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: remove dead codesb/remove-unused-var-from-builtin-addStefan Beller2015-07-311-2/+0
* | | | | | | | | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-122-116/+89
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | checkout: drop intimate knowledge of newly created worktreeEric Sunshine2015-07-201-7/+2
| * | | | | | | | | worktree: populate via "git reset --hard" rather than "git checkout"Eric Sunshine2015-07-201-2/+1
| * | | | | | | | | worktree: avoid resolving HEAD unnecessarilyEric Sunshine2015-07-201-12/+5
| * | | | | | | | | worktree: make setup of new HEAD distinct from worktree populationEric Sunshine2015-07-201-5/+15
| * | | | | | | | | worktree: detect branch-name/detached and error conditions locallyEric Sunshine2015-07-201-0/+18
| * | | | | | | | | worktree: add_worktree: construct worktree-population command locallyEric Sunshine2015-07-201-11/+8
| * | | | | | | | | worktree: elucidate environment variables intended for child processesEric Sunshine2015-07-201-2/+5
| * | | | | | | | | worktree: make branch creation distinct from worktree populationEric Sunshine2015-07-201-3/+14
| * | | | | | | | | worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine2015-07-201-1/+1
| * | | | | | | | | worktree: make --detach mutually exclusive with -b/-BEric Sunshine2015-07-201-2/+2
| * | | | | | | | | worktree: introduce options containerEric Sunshine2015-07-201-18/+27
| * | | | | | | | | worktree: simplify new branch (-b/-B) option checkingEric Sunshine2015-07-201-5/+8
| * | | | | | | | | worktree: improve worktree setup messageEric Sunshine2015-07-201-1/+1
| * | | | | | | | | branch: publish die_if_checked_out()Eric Sunshine2015-07-201-67/+0
| * | | | | | | | | checkout: teach check_linked_checkout() about symbolic link HEADEric Sunshine2015-07-201-1/+5
| * | | | | | | | | checkout: check_linked_checkout: simplify symref parsingEric Sunshine2015-07-201-9/+6
| * | | | | | | | | checkout: check_linked_checkout: improve "already checked out" aestheticEric Sunshine2015-07-201-0/+1
View Lorry Controller Status