aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Git 2.5.0-rc2v2.5.0-rc2Junio C Hamano2015-07-13
* 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
| * tests: worktree: retrofit "checkout --to" tests for "worktree add"Eric 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
| * Documentation/git-worktree: add EXAMPLES sectionEric Sunshine2015-07-06
| * Documentation/git-worktree: add high-level 'lock' overviewEric Sunshine2015-07-06
| * Documentation/git-worktree: split technical info from general descriptionEric Sunshine2015-07-06
| * Documentation/git-worktree: add BUGS sectionEric Sunshine2015-07-06
| * Documentation: move linked worktree description from checkout to worktreeEric Sunshine2015-07-06
| * Documentation/git-worktree: associate options with commandsEric Sunshine2015-07-06
| * Documentation/git-checkout: fix incorrect worktree prune commandEric 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 'kb/config-unmap-before-renaming'Junio C Hamano2015-07-13
|\ \ \
| * | | config.c: fix writing config files on Windows network sharesKarsten Blees2015-06-30
| |/ /
* | | Merge branch 'mh/strbuf-read-file-returns-ssize-t'Junio C Hamano2015-07-13
|\ \ \
| * | | strbuf: strbuf_read_file() should return ssize_tMichael Haggerty2015-07-03
| |/ /
* | | Merge branch 'jc/unexport-git-pager-in-use-in-pager'Junio C Hamano2015-07-13
|\ \ \
| * | | pager: do not leak "GIT_PAGER_IN_USE" to the pagerJunio C Hamano2015-07-03
* | | | Merge branch 'kb/use-nsec-doc'Junio C Hamano2015-07-13
|\ \ \ \
| * | | | Makefile / racy-git.txt: clarify USE_NSEC prerequisitesKarsten Blees2015-07-01
* | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano2015-07-13
|\ \ \ \ \
| * | | | | rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin2015-06-29
| * | | | | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-29
* | | | | | Merge branch 'et/http-proxyauth'Junio C Hamano2015-07-13
|\ \ \ \ \ \
| * | | | | | http: always use any proxy auth method availableEnrique Tobis2015-06-29
* | | | | | | Merge branch 'jc/fsck-retire-require-eoh'Junio C Hamano2015-07-13
|\ \ \ \ \ \ \
| * | | | | | | fsck: it is OK for a tag and a commit to lack the bodyJunio C Hamano2015-06-28
* | | | | | | | The last minute bits of fixesJunio C Hamano2015-07-10
* | | | | | | | Merge branch 'cb/rebase-am-exit-code'Junio C Hamano2015-07-10
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase: return non-zero error code if format-patch failsClemens Buchacher2015-07-08
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/fix-refresh-utime'Junio C Hamano2015-07-10
|\ \ \ \ \ \ \ \