Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notes | Jeff King | 2015-08-24 | 3 | -0/+6 |
* | Start preparing for 2.5.1 | Junio C Hamano | 2015-08-19 | 1 | -0/+49 |
* | Merge branch 'ta/docfix-index-format-tech' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
|\ | |||||
| * | typofix for index-format.txtta/docfix-index-format-tech | Thomas Ackermann | 2015-07-28 | 1 | -1/+1 |
* | | Merge branch 'kn/tag-doc-fix' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+0 |
|\ \ | |||||
| * | | Documentation/tag: remove double occurance of "<pattern>"kn/tag-doc-fix | Karthik Nayak | 2015-07-10 | 1 | -1/+0 |
* | | | Merge branch 'es/doc-clean-outdated-tools' into maint | Junio C Hamano | 2015-08-19 | 2 | -117/+9 |
|\ \ \ | |||||
| * | | | Documentation/git-tools: retire manually-maintained listes/doc-clean-outdated-tools | Eric Sunshine | 2015-07-28 | 1 | -81/+7 |
| * | | | Documentation/git-tools: drop references to defunct tools | Eric Sunshine | 2015-07-28 | 1 | -31/+0 |
| * | | | Documentation/git-tools: fix item text formatting | Eric Sunshine | 2015-07-28 | 1 | -67/+67 |
| * | | | Documentation/git-tools: improve discoverability of Git wiki | Eric Sunshine | 2015-07-28 | 1 | -6/+3 |
| * | | | Documentation/git: drop outdated Cogito reference | Eric Sunshine | 2015-07-25 | 1 | -1/+1 |
* | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-string | Ilya Bobyr | 2015-07-15 | 1 | -2/+2 |
* | | | | | Merge branch 'se/doc-checkout-ours-theirs' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | checkout: document subtlety around --ours/--theirsse/doc-checkout-ours-theirs | Simon A. Eugster | 2015-07-12 | 1 | -0/+15 |
| | |_|/ / | |/| | | | |||||
* | | | | | Sync with 2.4.8 | Junio C Hamano | 2015-08-03 | 2 | -2/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Git 2.4.8v2.4.8 | Junio C Hamano | 2015-08-03 | 2 | -1/+23 |
* | | | | | | Git 2.5v2.5.0js/rev-stdin-with-crlf | Junio C Hamano | 2015-07-27 | 1 | -0/+5 |
* | | | | | | Sync with 2.4.7 | Junio C Hamano | 2015-07-27 | 2 | -1/+55 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Git 2.4.7v2.4.7 | Junio C Hamano | 2015-07-27 | 2 | -1/+55 |
| * | | | | | Merge branch 'jk/pretty-encoding-doc' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'tb/checkout-doc' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+5 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ls/hint-rev-list-count' into maint | Junio C Hamano | 2015-07-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'mm/branch-doc-updates' into maint | Junio C Hamano | 2015-07-27 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | RelNotes: am.threeWay does not exist (yet) | Junio C Hamano | 2015-07-24 | 1 | -2/+0 |
* | | | | | | | | | | Revert "git-am: add am.threeWay config variable" | Junio C Hamano | 2015-07-24 | 2 | -13/+2 |
* | | | | | | | | | | Merge branch 'tf/gitweb-typofix' | Junio C Hamano | 2015-07-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | gitweb: fix typo in man pagetf/gitweb-typofix | Tony Finch | 2015-03-19 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-07-17 | 2 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference | Eric Sunshine | 2015-07-17 | 1 | -1/+1 |
| * | | | | | | | | | | worktree: caution that this is still experimental | Junio C Hamano | 2015-07-16 | 1 | -2/+3 |
| * | | | | | | | | | | Documentation/git-worktree: fix stale "git checkout --to" references | Eric Sunshine | 2015-07-16 | 1 | -2/+2 |
* | | | | | | | | | | | 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 | 2 | -1/+25 |
| * | | | | | | | | | | Merge branch 'mm/describe-doc' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'fk/doc-format-patch-vn' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | 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 |