summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'me/fetch-into-shallow-safety' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano2015-07-151-14/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'af/tcsh-completion-noclobber' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pa/auto-gc-mac-osx' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-152-6/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-07-151-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: parse ws-error-highlight option more strictlyjc/diff-ws-error-highlightRené Scharfe2015-07-121-1/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-poJunio C Hamano2015-07-138-9106/+11110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 65 new messagesRalf Thielow2015-07-081-1132/+1391
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate "index" as "Index"Ralf Thielow2015-07-081-69/+65
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: fix translation of "head nodes"Ralf Thielow2015-07-081-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: zh_CN: for git v2.5.0 l10n round 1Jiang Xin2015-07-051-1122/+1381
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: ca.po: update translationAlex Henrie2015-07-011-1127/+1382
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fr_2.5.0_round1' of git://github.com/jnavila/gitJiang Xin2015-07-021-1131/+1379
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: fr.po v2.5.0-rc0 (2355t)Jean-Noel Avila2015-06-301-1131/+1379
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2015-06-291-1158/+1401
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: Updated Bulgarian translation of git (2355t,0f,0u)Alexander Shopov2015-06-281-1158/+1401
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: sv.po: Update Swedish translation (2355t0f0u)Peter Krefting2015-06-281-1129/+1387
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: Updated Vietnamese translation (2355t)Tran Ngoc Quan2015-06-281-1132/+1382
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)Jiang Xin2015-06-271-1108/+1344
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.5.0-rc2v2.5.0-rc2Junio C Hamano2015-07-132-3/+45
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-07-138-260/+386
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano2015-07-123-7/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine2015-07-073-12/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-073-4/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-063-2/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: extract basename computation to new functionEric Sunshine2015-07-061-9/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: require worktree unconditionallyEric Sunshine2015-07-062-3/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: retire --to optionEric Sunshine2015-07-063-173/+139
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: worktree: retrofit "checkout --to" tests for "worktree add"Eric Sunshine2015-07-063-29/+25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add -b/-B optionsEric Sunshine2015-07-062-3/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add --detach optionEric Sunshine2015-07-062-2/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add --force optionEric Sunshine2015-07-062-2/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: introduce "add" commandEric Sunshine2015-07-062-10/+41
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-4/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-worktree: add EXAMPLES sectionEric Sunshine2015-07-061-0/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-worktree: add high-level 'lock' overviewEric Sunshine2015-07-061-9/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-worktree: split technical info from general descriptionEric Sunshine2015-07-061-34/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-worktree: add BUGS sectionEric Sunshine2015-07-061-3/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: move linked worktree description from checkout to worktreeEric Sunshine2015-07-062-67/+64
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-worktree: associate options with commandsEric Sunshine2015-07-061-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-checkout: fix incorrect worktree prune commandEric Sunshine2015-07-061-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-1313-126/+217
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: new place for "git prune --worktrees"nd/multiple-work-treesNguyễn Thái Ngọc Duy2015-06-2911-114/+198
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy2015-06-122-12/+19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/clone-guess-dir-name-simplify'Junio C Hamano2015-07-131-13/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \