Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/negative-hiderefs' | Junio C Hamano | 2015-08-19 | 1 | -17/+20 |
|\ | |||||
| * | refs: support negative transfer.hideRefsjk/negative-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-17 | 1 | -0/+11 |
* | | Merge branch 'ta/docfix-index-format-tech' | Junio C Hamano | 2015-08-17 | 1 | -1/+1 |
|\ \ | |||||
| * | | typofix for index-format.txtta/docfix-index-format-tech | 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-04 | 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 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 'jk/refspec-parse-wildcard' | Junio C Hamano | 2015-08-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | refs: loosen restriction on wildcard "*" refspecsjk/refspec-parse-wildcard | 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 documentszb/userdiff-fountain | Zoë Blade | 2015-07-23 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'dt/refs-backend-preamble' | Junio C Hamano | 2015-08-03 | 3 | -2/+12 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | update-ref and tag: add --create-reflog arg | David Turner | 2015-07-21 | 2 | -2/+8 |
| * | | | | | | | | git-reflog: add exists command | David Turner | 2015-07-21 | 1 | -0/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/date-mode-format' | Junio C Hamano | 2015-08-03 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | introduce "format" date-mode | Jeff King | 2015-06-29 | 1 | -0/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'se/doc-checkout-ours-theirs' | Junio C Hamano | 2015-08-03 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: document subtlety around --ours/--theirsse/doc-checkout-ours-theirs | Simon A. Eugster | 2015-07-12 | 1 | -0/+15 |
* | | | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' | Junio C Hamano | 2015-08-03 | 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 'kn/tag-doc-fix' | Junio C Hamano | 2015-08-03 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/tag: remove double occurance of "<pattern>"kn/tag-doc-fix | Karthik Nayak | 2015-07-10 | 1 | -1/+0 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mh/fast-import-get-mark' | Junio C Hamano | 2015-08-03 | 1 | -6/+33 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fast-import: add a get-mark commandmh/fast-import-get-mark | Michael Haggerty | 2015-07-01 | 1 | -6/+33 |