Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mh/tempfile' | Junio C Hamano | 2015-08-25 | 1 | -220/+0 |
|\ | |||||
| * | lockfile: move documentation to lockfile.h and lockfile.c | Michael Haggerty | 2015-08-10 | 1 | -220/+0 |
* | | Merge branch 'dt/refs-pseudo' | Junio C Hamano | 2015-08-25 | 1 | -0/+21 |
|\ \ | |||||
| * | | refs: introduce pseudoref and per-worktree ref concepts | David Turner | 2015-07-31 | 1 | -0/+21 |
* | | | Sync with maint | Junio C Hamano | 2015-08-19 | 1 | -0/+49 |
|\ \ \ | |||||
| * | | | 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 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'kn/tag-doc-fix' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+0 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'es/doc-clean-outdated-tools' into maint | Junio C Hamano | 2015-08-19 | 2 | -117/+9 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'se/doc-checkout-ours-theirs' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | Fourth batch for 2.6 | Junio C Hamano | 2015-08-19 | 1 | -1/+34 |
* | | | | | | | | | Merge branch 'jk/negative-hiderefs' | Junio C Hamano | 2015-08-19 | 1 | -17/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | refs: support negative transfer.hideRefs | Jeff King | 2015-08-07 | 1 | -0/+5 |
| * | | | | | | | | | docs/config.txt: reorder hideRefs config | Jeff King | 2015-07-28 | 1 | -17/+15 |
* | | | | | | | | | | Third batch for 2.6 | Junio C Hamano | 2015-08-18 | 1 | -0/+11 |
* | | | | | | | | | | Merge branch 'ta/docfix-index-format-tech' | Junio C Hamano | 2015-08-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | typofix for index-format.txt | Thomas Ackermann | 2015-07-28 | 1 | -1/+1 |
* | | | | | | | | | | Second batch for 2.6 | Junio C Hamano | 2015-08-12 | 1 | -0/+25 |
* | | | | | | | | | | Merge branch 'es/worktree-add-cleanup' | Junio C Hamano | 2015-08-12 | 2 | -10/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation/git-worktree: fix duplicated 'from' | Patrick Steinhardt | 2015-08-05 | 1 | -1/+1 |
| * | | | | | | | | | | Documentation/config: mention "now" and "never" for 'expire' settings | Eric Sunshine | 2015-07-28 | 1 | -5/+11 |
| * | | | | | | | | | | Documentation/git-worktree: fix broken 'linkgit' invocation | Eric Sunshine | 2015-07-24 | 1 | -1/+1 |
| * | | | | | | | | | | worktree: add: suppress auto-vivication with --detach and no <branch> | Eric Sunshine | 2015-07-20 | 1 | -3/+3 |
* | | | | | | | | | | | Merge branch 'pt/am-builtin' | Junio C Hamano | 2015-08-12 | 2 | -2/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-am: add am.threeWay config variable | Remi Lespinet | 2015-08-05 | 2 | -2/+13 |
* | | | | | | | | | | | | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-08-12 | 3 | -37/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire" | Eric Sunshine | 2015-07-20 | 2 | -3/+2 |
| * | | | | | | | | | | | Documentation/git-worktree: wordsmith worktree-related manpages | Michael Haggerty | 2015-07-20 | 2 | -11/+12 |
| * | | | | | | | | | | | Documentation/config: fix stale "git prune --worktree" reference | Michael Haggerty | 2015-07-20 | 1 | -1/+1 |
| * | | | | | | | | | | | Documentation/git-worktree: fix incorrect reference to file "locked" | Michael Haggerty | 2015-07-20 | 1 | -1/+1 |
| * | | | | | | | | | | | Documentation/git-worktree: consistently use term "linked working tree" | Michael Haggerty | 2015-07-20 | 2 | -23/+23 |
* | | | | | | | | | | | | Merge branch 'ad/bisect-cleanup' | Junio C Hamano | 2015-08-12 | 1 | -60/+73 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Documentation/bisect: revise overall content | Michael Haggerty | 2015-06-26 | 1 | -54/+68 |
| * | | | | | | | | | | | | Documentation/bisect: move getting help section to the end | Matthieu Moy | 2015-06-26 | 1 | -6/+5 |
* | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2015-08-03 | 2 | -2/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 |
* | | | | | | | | | | | | | First batch for 2.6 | Junio C Hamano | 2015-08-03 | 1 | -0/+154 |
* | | | | | | | | | | | | | Merge branch 'es/doc-clean-outdated-tools' | Junio C Hamano | 2015-08-03 | 2 | -117/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Documentation/git-tools: retire manually-maintained list | 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 'jk/refspec-parse-wildcard' | Junio C Hamano | 2015-08-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | refs: loosen restriction on wildcard "*" refspecs | Jacob Keller | 2015-07-27 | 1 | -2/+2 |
* | | | | | | | | | | | | | Merge branch 'zb/userdiff-fountain' | Junio C Hamano | 2015-08-03 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | userdiff: add support for Fountain documents | Zoë Blade | 2015-07-23 | 1 | -0/+2 |
* | | | | | | | | | | | | | | Merge branch 'dt/refs-backend-preamble' | Junio C Hamano | 2015-08-03 | 3 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |