summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* gc: remove garbage .idx files from pack dirdk/gc-idx-wo-packDoug Kelly2015-11-041-0/+21
* prepare_packed_git(): refactor garbage reporting in pack directoryJunio C Hamano2015-08-171-2/+24
* Merge branch 'es/worktree-add'Junio C Hamano2015-07-132-153/+199
|\
| * Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano2015-07-122-4/+6
| * checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine2015-07-072-6/+4
| * worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-071-2/+6
| * worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-061-2/+4
| * worktree: extract basename computation to new functionEric Sunshine2015-07-061-9/+20
| * checkout: require worktree unconditionallyEric Sunshine2015-07-061-2/+0
| * checkout: retire --to optionEric Sunshine2015-07-062-166/+139
| * worktree: add -b/-B optionsEric Sunshine2015-07-061-0/+11
| * worktree: add --detach optionEric Sunshine2015-07-061-1/+4
| * worktree: add --force optionEric Sunshine2015-07-061-1/+5
| * worktree: introduce "add" commandEric Sunshine2015-07-061-0/+31
| * checkout: drop 'checkout_opts' dependency from prepare_linked_checkoutEric Sunshine2015-07-061-4/+5
| * checkout: make --to unconditionally verboseEric Sunshine2015-07-061-2/+1
| * checkout: prepare_linked_checkout: drop now-unused 'new' argumentEric Sunshine2015-07-061-3/+2
| * checkout: relocate --to's "no branch specified" checkEric Sunshine2015-07-061-3/+4
| * checkout: fix bug with --to and relative HEADEric Sunshine2015-07-061-4/+12
* | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-134-112/+145
|\ \ | |/
| * worktree: new place for "git prune --worktrees"nd/multiple-work-treesNguyễn Thái Ngọc Duy2015-06-293-100/+134
| * checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy2015-06-121-12/+11
* | Merge branch 'ss/clone-guess-dir-name-simplify'Junio C Hamano2015-07-131-13/+6
|\ \
| * | clone: simplify string handling in guess_dir_name()ss/clone-guess-dir-name-simplifySebastian Schuberth2015-07-091-13/+6
* | | Merge branch 'ls/hint-rev-list-count'Junio C Hamano2015-07-101-0/+1
|\ \ \
| * | | rev-list: add --count to usage guidels/hint-rev-list-countLawrence Siebert2015-07-011-0/+1
| |/ /
| * | Merge branch 'jk/clone-dissociate' into maintJunio C Hamano2015-06-161-13/+4
| |\ \
| * \ \ Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-162-2/+2
| |\ \ \
| * \ \ \ Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-163-16/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano2015-06-161-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-051-0/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-051-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano2015-06-051-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2015-06-051-3/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-051-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-051-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-052-9/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-261-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano2015-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruningJeff King2015-07-011-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'Junio C Hamano2015-07-091-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | index-pack: fix allocation of sorted_by_pos arrayjc/fix-alloc-sortbuf-in-index-packJunio C Hamano2015-07-041-8/+8
* | | | | | | | | | | | | | | | | | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-aJunio C Hamano2015-06-231-1/+0
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheckJeff King2015-06-091-1/+1
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano2015-06-241-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-021-0/+5
* | | | | | | | | | | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries'Junio C Hamano2015-06-241-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \