Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.5.0-rc2v2.5.0-rc2 | Junio C Hamano | 2015-07-13 | 1 | -2/+44 |
* | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-07-13 | 2 | -79/+134 |
|\ | |||||
| * | Revert "checkout: retire --ignore-other-worktrees in favor of --force" | Junio C Hamano | 2015-07-12 | 1 | -3/+6 |
| * | checkout: retire --ignore-other-worktrees in favor of --force | Eric Sunshine | 2015-07-07 | 1 | -6/+3 |
| * | worktree: add: auto-vivify new branch when <branch> is omitted | Eric Sunshine | 2015-07-07 | 1 | -2/+6 |
| * | worktree: add: make -b/-B default to HEAD when <branch> is omitted | Eric Sunshine | 2015-07-06 | 1 | -0/+1 |
| * | checkout: retire --to option | Eric Sunshine | 2015-07-06 | 1 | -7/+0 |
| * | worktree: add -b/-B options | Eric Sunshine | 2015-07-06 | 1 | -3/+10 |
| * | worktree: add --detach option | Eric Sunshine | 2015-07-06 | 1 | -1/+5 |
| * | worktree: add --force option | Eric Sunshine | 2015-07-06 | 1 | -1/+7 |
| * | worktree: introduce "add" command | Eric Sunshine | 2015-07-06 | 1 | -10/+10 |
| * | 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 |
| * | Documentation/git-worktree: add BUGS section | Eric Sunshine | 2015-07-06 | 1 | -3/+16 |
| * | Documentation: move linked worktree description from checkout to worktree | Eric Sunshine | 2015-07-06 | 2 | -67/+64 |
| * | Documentation/git-worktree: associate options with commands | Eric Sunshine | 2015-07-06 | 1 | -3/+3 |
| * | Documentation/git-checkout: fix incorrect worktree prune command | Eric Sunshine | 2015-07-06 | 1 | -1/+1 |
* | | Merge branch 'nd/multiple-work-trees' | Junio C Hamano | 2015-07-13 | 2 | -3/+48 |
|\ \ | |/ | |||||
| * | worktree: new place for "git prune --worktrees"nd/multiple-work-trees | Nguyễn Thái Ngọc Duy | 2015-06-29 | 2 | -3/+48 |
* | | Merge branch 'kb/use-nsec-doc' | Junio C Hamano | 2015-07-13 | 1 | -2/+6 |
|\ \ | |||||
| * | | Makefile / racy-git.txt: clarify USE_NSEC prerequisiteskb/use-nsec-doc | Karsten Blees | 2015-07-01 | 1 | -2/+6 |
* | | | The last minute bits of fixes | Junio C Hamano | 2015-07-10 | 1 | -0/+21 |
* | | | Merge branch 'mm/branch-doc-updates' | Junio C Hamano | 2015-07-10 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | Documentation/branch: document -M and -D in terms of --forcemm/branch-doc-updates | Matthieu Moy | 2015-07-06 | 1 | -2/+2 |
| * | | | Documentation/branch: document -d --force and -m --force | Matthieu Moy | 2015-07-06 | 1 | -0/+4 |
* | | | | Merge branch 'ls/hint-rev-list-count' | Junio C Hamano | 2015-07-10 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | rev-list: add --count to usage guidels/hint-rev-list-count | Lawrence Siebert | 2015-07-01 | 1 | -0/+1 |
* | | | | | Merge branch 'tb/checkout-doc' | Junio C Hamano | 2015-07-10 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | git-checkout.txt: document "git checkout <pathspec>" bettertb/checkout-doc | Torsten Bögershausen | 2015-06-17 | 1 | -1/+5 |
* | | | | | | Merge branch 'jk/pretty-encoding-doc' | Junio C Hamano | 2015-07-10 | 1 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | docs: clarify that --encoding can produce invalid sequencesjk/pretty-encoding-doc | Jeff King | 2015-06-17 | 1 | -1/+4 |
* | | | | | | | Git 2.5.0-rc1v2.5.0-rc1 | Junio C Hamano | 2015-07-01 | 1 | -0/+7 |
* | | | | | | | Merge branch 'mm/describe-doc' | Junio C Hamano | 2015-07-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/describe: improve one-line summarymm/describe-doc | Matthieu Moy | 2015-06-16 | 1 | -1/+1 |
* | | | | | | | | Git 2.5.0-rc0v2.5.0-rc0 | Junio C Hamano | 2015-06-25 | 1 | -15/+2 |
* | | | | | | | | Sync with 2.4.5 | Junio C Hamano | 2015-06-25 | 2 | -1/+30 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Git 2.4.5v2.4.5 | Junio C Hamano | 2015-06-25 | 2 | -1/+30 |
| * | | | | | | | Merge branch 'sg/merge-summary-config' into maint | Junio C Hamano | 2015-06-25 | 3 | -16/+12 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'sb/pack-protocol-mention-smart-http' into maint | Junio C Hamano | 2015-06-25 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/color-diff-plain-is-context' into maint | Junio C Hamano | 2015-06-25 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Ninth batch for 2.5 | Junio C Hamano | 2015-06-24 | 1 | -39/+102 |
* | | | | | | | | | | Merge branch 'fk/doc-format-patch-vn' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | doc: format-patch: fix typofk/doc-format-patch-vn | Frans Klaver | 2015-06-10 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'rl/am-3way-config' | Junio C Hamano | 2015-06-24 | 2 | -2/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-am: add am.threeWay config variablerl/am-3way-config | Remi Lespinet | 2015-06-04 | 2 | -2/+13 |
* | | | | | | | | | | | | Merge branch 'jc/ll-merge-expose-path' | Junio C Hamano | 2015-06-24 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | ll-merge: pass the original path to external driversjc/ll-merge-expose-path | Junio C Hamano | 2015-06-04 | 1 | -1/+4 |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'pt/pull-optparse' | Junio C Hamano | 2015-06-24 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pull: handle git-fetch's options as well | Paul Tan | 2015-06-02 | 1 | -3/+0 |