aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'es/worktree-add'Junio C Hamano2015-07-13
|\
| * Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano2015-07-12
| * checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine2015-07-07
| * worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-07
| * worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-06
| * worktree: extract basename computation to new functionEric Sunshine2015-07-06
| * checkout: require worktree unconditionallyEric Sunshine2015-07-06
| * checkout: retire --to optionEric Sunshine2015-07-06
| * worktree: add -b/-B optionsEric Sunshine2015-07-06
| * worktree: add --detach optionEric Sunshine2015-07-06
| * worktree: add --force optionEric Sunshine2015-07-06
| * worktree: introduce "add" commandEric Sunshine2015-07-06
| * checkout: drop 'checkout_opts' dependency from prepare_linked_checkoutEric Sunshine2015-07-06
| * checkout: make --to unconditionally verboseEric Sunshine2015-07-06
| * checkout: prepare_linked_checkout: drop now-unused 'new' argumentEric Sunshine2015-07-06
| * checkout: relocate --to's "no branch specified" checkEric Sunshine2015-07-06
| * checkout: fix bug with --to and relative HEADEric Sunshine2015-07-06
* | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-13
|\ \ | |/
| * worktree: new place for "git prune --worktrees"Nguyễn Thái Ngọc Duy2015-06-29
| * checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy2015-06-12
* | Merge branch 'ss/clone-guess-dir-name-simplify'Junio C Hamano2015-07-13
|\ \
| * | clone: simplify string handling in guess_dir_name()Sebastian Schuberth2015-07-09
* | | Merge branch 'ls/hint-rev-list-count'Junio C Hamano2015-07-10
|\ \ \
| * | | rev-list: add --count to usage guideLawrence Siebert2015-07-01
| |/ /
| * | Merge branch 'jk/clone-dissociate' into maintJunio C Hamano2015-06-16
| |\ \
| * \ \ Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-16
| |\ \ \
| * \ \ \ Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-16
| |\ \ \ \
| * \ \ \ \ Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano2015-07-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rev-list: disable --use-bitmap-index when pruning commitsJeff King2015-07-01
* | | | | | | | | | | | | | | | | Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'Junio C Hamano2015-07-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | index-pack: fix allocation of sorted_by_pos arrayJunio C Hamano2015-07-04
* | | | | | | | | | | | | | | | | | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"Junio C Hamano2015-06-23
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | index-pack: avoid excessive re-reading of pack directoryJeff King2015-06-09
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-02
* | | | | | | | | | | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | fsck: report errors if reflog entries point at invalid objectsMichael Haggerty2015-06-08
| * | | | | | | | | | | | | | | | | | | | fsck_handle_reflog_sha1(): new functionMichael Haggerty2015-06-08