Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with 2.4.6 | Junio C Hamano | 2015-07-15 | 2 | -1/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.4.6v2.4.6 | Junio C Hamano | 2015-07-15 | 4 | -3/+27 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/describe-doc' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/prompt-document-ps1-state-separator' into maint | Junio C Hamano | 2015-07-15 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/osx-header-pollutes-mask-macro' into maint | Junio C Hamano | 2015-07-15 | 4 | -29/+29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/utf8-stupid-compiler-workaround' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fk/doc-format-patch-vn' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/t0302-needs-sanity' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'me/fetch-into-shallow-safety' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/fsck-reflog-entries' into maint | Junio C Hamano | 2015-07-15 | 1 | -14/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'af/tcsh-completion-noclobber' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pa/auto-gc-mac-osx' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint | Junio C Hamano | 2015-07-15 | 2 | -6/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-07-15 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: parse ws-error-highlight option more strictlyjc/diff-ws-error-highlight | René Scharfe | 2015-07-12 | 1 | -1/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-po | Junio C Hamano | 2015-07-13 | 8 | -9106/+11110 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 65 new messages | Ralf Thielow | 2015-07-08 | 1 | -1132/+1391 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate "index" as "Index" | Ralf Thielow | 2015-07-08 | 1 | -69/+65 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: fix translation of "head nodes" | Ralf Thielow | 2015-07-08 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: zh_CN: for git v2.5.0 l10n round 1 | Jiang Xin | 2015-07-05 | 1 | -1122/+1381 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: ca.po: update translation | Alex Henrie | 2015-07-01 | 1 | -1127/+1382 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fr_2.5.0_round1' of git://github.com/jnavila/git | Jiang Xin | 2015-07-02 | 1 | -1131/+1379 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: fr.po v2.5.0-rc0 (2355t) | Jean-Noel Avila | 2015-06-30 | 1 | -1131/+1379 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/alshopov/git-po | Jiang Xin | 2015-06-29 | 1 | -1158/+1401 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: Updated Bulgarian translation of git (2355t,0f,0u) | Alexander Shopov | 2015-06-28 | 1 | -1158/+1401 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: sv.po: Update Swedish translation (2355t0f0u) | Peter Krefting | 2015-06-28 | 1 | -1129/+1387 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: Updated Vietnamese translation (2355t) | Tran Ngoc Quan | 2015-06-28 | 1 | -1132/+1382 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed) | Jiang Xin | 2015-06-27 | 1 | -1108/+1344 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.5.0-rc2v2.5.0-rc2 | Junio C Hamano | 2015-07-13 | 2 | -3/+45 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-07-13 | 8 | -260/+386 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "checkout: retire --ignore-other-worktrees in favor of --force" | Junio C Hamano | 2015-07-12 | 3 | -7/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: retire --ignore-other-worktrees in favor of --force | Eric Sunshine | 2015-07-07 | 3 | -12/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add: auto-vivify new branch when <branch> is omitted | Eric Sunshine | 2015-07-07 | 3 | -4/+26 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add: make -b/-B default to HEAD when <branch> is omitted | Eric Sunshine | 2015-07-06 | 3 | -2/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: extract basename computation to new function | Eric Sunshine | 2015-07-06 | 1 | -9/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: require worktree unconditionally | Eric Sunshine | 2015-07-06 | 2 | -3/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: retire --to option | Eric Sunshine | 2015-07-06 | 3 | -173/+139 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: worktree: retrofit "checkout --to" tests for "worktree add" | Eric Sunshine | 2015-07-06 | 3 | -29/+25 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add -b/-B options | Eric Sunshine | 2015-07-06 | 2 | -3/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add --detach option | Eric Sunshine | 2015-07-06 | 2 | -2/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add --force option | Eric Sunshine | 2015-07-06 | 2 | -2/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: introduce "add" command | Eric Sunshine | 2015-07-06 | 2 | -10/+41 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: drop 'checkout_opts' dependency from prepare_linked_checkout | Eric Sunshine | 2015-07-06 | 1 | -4/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: make --to unconditionally verbose | Eric Sunshine | 2015-07-06 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: prepare_linked_checkout: drop now-unused 'new' argument | Eric Sunshine | 2015-07-06 | 1 | -3/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: relocate --to's "no branch specified" check | Eric Sunshine | 2015-07-06 | 1 | -3/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: fix bug with --to and relative HEAD | Eric Sunshine | 2015-07-06 | 2 | -4/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-worktree: add EXAMPLES section | Eric Sunshine | 2015-07-06 | 1 | -0/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-worktree: add high-level 'lock' overview | Eric Sunshine | 2015-07-06 | 1 | -9/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-worktree: split technical info from general description | Eric Sunshine | 2015-07-06 | 1 | -34/+36 |