summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ms/non-ascii-ticks'Junio C Hamano2018-03-061-7/+7
|\
| * Documentation/gitsubmodules.txt: avoid non-ASCII apostrophesms/non-ascii-ticksMotoki Seki2018-02-221-7/+7
* | Merge branch 'bw/doc-submodule-recurse-config-with-clone'Junio C Hamano2018-03-061-1/+2
|\ \
| * | submodule: indicate that 'submodule.recurse' doesn't apply to clonebw/doc-submodule-recurse-config-with-cloneBrandon Williams2018-02-211-1/+2
| |/
* | Merge branch 'jc/allow-ff-merging-kept-tags'Junio C Hamano2018-03-061-1/+2
|\ \
| * | merge: allow fast-forward when merging a tracked tagjc/allow-ff-merging-kept-tagsJunio C Hamano2018-02-161-1/+2
* | | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-062-2/+11
|\ \ \
| * | | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patchNguyễn Thái Ngọc Duy2018-02-121-1/+2
| * | | rebase: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-1/+5
| * | | am: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-1/+5
* | | | Merge branch 'ab/fetch-prune'Junio C Hamano2018-03-064-7/+131
|\ \ \ \
| * | | | fetch: make the --prune-tags work with <url>ab/fetch-pruneÆvar Arnfjörð Bjarmason2018-02-091-15/+6
| * | | | fetch: add a --prune-tags option and fetch.pruneTags configÆvar Arnfjörð Bjarmason2018-02-093-1/+74
| * | | | git-fetch & config doc: link to the new PRUNING sectionÆvar Arnfjörð Bjarmason2018-02-092-1/+8
| * | | | git remote doc: correct dangerous lies about what prune doesÆvar Arnfjörð Bjarmason2018-02-091-5/+9
| * | | | git fetch doc: add a new section to explain the ins & outs of pruningÆvar Arnfjörð Bjarmason2018-02-091-0/+49
* | | | | Merge branch 'nm/tag-edit'Junio C Hamano2018-03-061-1/+7
|\ \ \ \ \
| * | | | | tag: add --edit optionnm/tag-editNicolas Morey-Chaisemartin2018-02-071-1/+7
* | | | | | Sixth batch for 2.17Junio C Hamano2018-02-281-5/+25
* | | | | | Merge branch 'tg/worktree-create-tracking'Junio C Hamano2018-02-281-2/+3
|\ \ \ \ \ \
| * | | | | | git-worktree.txt: fix indentation of example and text of 'add' commandtg/worktree-create-trackingEric Sunshine2018-02-161-0/+1
| * | | | | | git-worktree.txt: fix missing ")" typoEric Sunshine2018-02-161-2/+2
* | | | | | | Merge branch 'sb/status-doc-fix'Junio C Hamano2018-02-281-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-status: clarify status table for porcelain modesb/status-doc-fixStefan Beller2018-02-151-2/+2
* | | | | | | | Merge branch 'nd/am-quit'Junio C Hamano2018-02-281-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | am: support --quitnd/am-quitNguyễn Thái Ngọc Duy2018-02-141-1/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fifth batch for 2.17Junio C Hamano2018-02-271-10/+48
* | | | | | | | Merge branch 'rd/typofix'Junio C Hamano2018-02-271-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofixRobert P. J. Day2018-02-141-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'bp/fsmonitor'Junio C Hamano2018-02-271-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fsmonitor: update documentation to remove reference to invalid config settingsbp/fsmonitorBen Peart2018-02-141-2/+2
* | | | | | | | | Merge branch 'bc/doc-interpret-trailers-grammofix'Junio C Hamano2018-02-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs/interpret-trailers: fix agreement errorbc/doc-interpret-trailers-grammofixbrian m. carlson2018-02-131-1/+1
* | | | | | | | | | Merge branch 'jk/doc-do-not-write-extern'Junio C Hamano2018-02-271-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CodingGuidelines: mention "static" and "extern"jk/doc-do-not-write-externJeff King2018-02-081-0/+5
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ab/untracked-cache-invalidation-docs'Junio C Hamano2018-02-271-0/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update-index doc: note the caveat with "could not open..."ab/untracked-cache-invalidation-docsÆvar Arnfjörð Bjarmason2018-02-091-0/+10
| * | | | | | | | | | update-index doc: note a fixed bug in the untracked cacheÆvar Arnfjörð Bjarmason2018-02-091-0/+16
* | | | | | | | | | | Fourth batch for 2.17Junio C Hamano2018-02-211-0/+12
* | | | | | | | | | | Merge branch 'gs/rebase-allow-empty-message'Junio C Hamano2018-02-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase: add --allow-empty-message optiongs/rebase-allow-empty-messageGenki Sky2018-02-071-0/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'lw/daemon-log-destination'Junio C Hamano2018-02-211-3/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | daemon: add --log-destination=(stderr|syslog|none)lw/daemon-log-destinationLucas Werkmeister2018-02-051-3/+25
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Sync with 2.16.2Junio C Hamano2018-02-151-0/+30
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Git 2.16.2v2.16.2Junio C Hamano2018-02-151-0/+30
| * | | | | | | | | | Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maintJunio C Hamano2018-02-151-3/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'as/read-tree-prefix-doc-fix' into maintJunio C Hamano2018-02-151-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Third batch for 2.17Junio C Hamano2018-02-151-0/+26
* | | | | | | | | | | | Merge branch 'nd/ignore-glob-doc-update'Junio C Hamano2018-02-151-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitignore.txt: elaborate shell glob syntaxnd/ignore-glob-doc-updateDuy Nguyen2018-02-021-6/+5