Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ms/non-ascii-ticks' | Junio C Hamano | 2018-03-06 | 1 | -7/+7 |
|\ | |||||
| * | Documentation/gitsubmodules.txt: avoid non-ASCII apostrophesms/non-ascii-ticks | Motoki Seki | 2018-02-22 | 1 | -7/+7 |
* | | Merge branch 'bw/doc-submodule-recurse-config-with-clone' | Junio C Hamano | 2018-03-06 | 1 | -1/+2 |
|\ \ | |||||
| * | | submodule: indicate that 'submodule.recurse' doesn't apply to clonebw/doc-submodule-recurse-config-with-clone | Brandon Williams | 2018-02-21 | 1 | -1/+2 |
| |/ | |||||
* | | Merge branch 'jc/allow-ff-merging-kept-tags' | Junio C Hamano | 2018-03-06 | 1 | -1/+2 |
|\ \ | |||||
| * | | merge: allow fast-forward when merging a tracked tagjc/allow-ff-merging-kept-tags | Junio C Hamano | 2018-02-16 | 1 | -1/+2 |
* | | | Merge branch 'nd/rebase-show-current-patch' | Junio C Hamano | 2018-03-06 | 2 | -2/+11 |
|\ \ \ | |||||
| * | | | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -1/+2 |
| * | | | rebase: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -1/+5 |
| * | | | am: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -1/+5 |
* | | | | Merge branch 'ab/fetch-prune' | Junio C Hamano | 2018-03-06 | 4 | -7/+131 |
|\ \ \ \ | |||||
| * | | | | fetch: make the --prune-tags work with <url>ab/fetch-prune | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -15/+6 |
| * | | | | fetch: add a --prune-tags option and fetch.pruneTags config | Ævar Arnfjörð Bjarmason | 2018-02-09 | 3 | -1/+74 |
| * | | | | git-fetch & config doc: link to the new PRUNING section | Ævar Arnfjörð Bjarmason | 2018-02-09 | 2 | -1/+8 |
| * | | | | git remote doc: correct dangerous lies about what prune does | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -5/+9 |
| * | | | | git fetch doc: add a new section to explain the ins & outs of pruning | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -0/+49 |
* | | | | | Merge branch 'nm/tag-edit' | Junio C Hamano | 2018-03-06 | 1 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | tag: add --edit optionnm/tag-edit | Nicolas Morey-Chaisemartin | 2018-02-07 | 1 | -1/+7 |
* | | | | | | Sixth batch for 2.17 | Junio C Hamano | 2018-02-28 | 1 | -5/+25 |
* | | | | | | Merge branch 'tg/worktree-create-tracking' | Junio C Hamano | 2018-02-28 | 1 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-worktree.txt: fix indentation of example and text of 'add' commandtg/worktree-create-tracking | Eric Sunshine | 2018-02-16 | 1 | -0/+1 |
| * | | | | | | git-worktree.txt: fix missing ")" typo | Eric Sunshine | 2018-02-16 | 1 | -2/+2 |
* | | | | | | | Merge branch 'sb/status-doc-fix' | Junio C Hamano | 2018-02-28 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/git-status: clarify status table for porcelain modesb/status-doc-fix | Stefan Beller | 2018-02-15 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'nd/am-quit' | Junio C Hamano | 2018-02-28 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | am: support --quitnd/am-quit | Nguyễn Thái Ngọc Duy | 2018-02-14 | 1 | -1/+5 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Fifth batch for 2.17 | Junio C Hamano | 2018-02-27 | 1 | -10/+48 |
* | | | | | | | | Merge branch 'rd/typofix' | Junio C Hamano | 2018-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofix | Robert P. J. Day | 2018-02-14 | 1 | -1/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'bp/fsmonitor' | Junio C Hamano | 2018-02-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fsmonitor: update documentation to remove reference to invalid config settingsbp/fsmonitor | Ben Peart | 2018-02-14 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'bc/doc-interpret-trailers-grammofix' | Junio C Hamano | 2018-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | docs/interpret-trailers: fix agreement errorbc/doc-interpret-trailers-grammofix | brian m. carlson | 2018-02-13 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'jk/doc-do-not-write-extern' | Junio C Hamano | 2018-02-27 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | CodingGuidelines: mention "static" and "extern"jk/doc-do-not-write-extern | Jeff King | 2018-02-08 | 1 | -0/+5 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ab/untracked-cache-invalidation-docs' | Junio C Hamano | 2018-02-27 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | update-index doc: note the caveat with "could not open..."ab/untracked-cache-invalidation-docs | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -0/+10 |
| * | | | | | | | | | | update-index doc: note a fixed bug in the untracked cache | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -0/+16 |
* | | | | | | | | | | | Fourth batch for 2.17 | Junio C Hamano | 2018-02-21 | 1 | -0/+12 |
* | | | | | | | | | | | Merge branch 'gs/rebase-allow-empty-message' | Junio C Hamano | 2018-02-21 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | rebase: add --allow-empty-message optiongs/rebase-allow-empty-message | Genki Sky | 2018-02-07 | 1 | -0/+5 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'lw/daemon-log-destination' | Junio C Hamano | 2018-02-21 | 1 | -3/+25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | daemon: add --log-destination=(stderr|syslog|none)lw/daemon-log-destination | Lucas Werkmeister | 2018-02-05 | 1 | -3/+25 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Sync with 2.16.2 | Junio C Hamano | 2018-02-15 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Git 2.16.2v2.16.2 | Junio C Hamano | 2018-02-15 | 1 | -0/+30 |
| * | | | | | | | | | | Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maint | Junio C Hamano | 2018-02-15 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/read-tree-prefix-doc-fix' into maint | Junio C Hamano | 2018-02-15 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Third batch for 2.17 | Junio C Hamano | 2018-02-15 | 1 | -0/+26 |
* | | | | | | | | | | | | Merge branch 'nd/ignore-glob-doc-update' | Junio C Hamano | 2018-02-15 | 1 | -6/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | gitignore.txt: elaborate shell glob syntaxnd/ignore-glob-doc-update | Duy Nguyen | 2018-02-02 | 1 | -6/+5 |