summaryrefslogtreecommitdiffstats
path: root/Documentation (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/dco-indentation-fix'Junio C Hamano2015-01-071-6/+6
|\
| * Documentation/SubmittingPatches: unify whitespace/tabs for the DCOStefan Beller2014-12-221-6/+6
* | Merge branch 'lh/send-email-hide-x-mailer'Junio C Hamano2015-01-072-0/+6
|\ \
| * | send-email: add --[no-]xmailer optionLuis Henriques2014-12-162-0/+6
* | | Merge branch 'br/imap-send-via-libcurl'Junio C Hamano2015-01-071-2/+13
|\ \ \
| * | | git-imap-send: use libcurl for implementationBernhard Reiter2014-11-101-2/+13
* | | | Merge branch 'br/imap-send-verbosity'Junio C Hamano2015-01-071-1/+13
|\| | |
| * | | imap-send: use parse options API to determine verbosityBernhard Reiter2014-11-061-1/+13
* | | | Merge branch 'jc/clone-borrow'Junio C Hamano2015-01-071-2/+9
|\ \ \ \
| * | | | clone: --dissociate option to mark that reference is only temporaryJunio C Hamano2014-10-151-2/+9
* | | | | Sync with maintJunio C Hamano2014-12-221-0/+33
|\ \ \ \ \
| * | | | | Prepare for 2.2.2Junio C Hamano2014-12-221-0/+33
| * | | | | Merge branch 'po/everyday-doc' into maintJunio C Hamano2014-12-221-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-221-0/+4
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Third batch for 2.3 cycleJunio C Hamano2014-12-221-2/+93
* | | | | | | Merge branch 'nd/split-index'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | index-format.txt: add a missing closing quoteNguyễn Thái Ngọc Duy2014-12-111-1/+1
* | | | | | | | Merge branch 'jk/colors'Junio C Hamano2014-12-221-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | parse_color: recognize "no$foo" to clear the $foo attributeJeff King2014-11-201-1/+2
| * | | | | | | | parse_color: support 24-bit RGB valuesJeff King2014-11-201-1/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rw/apply-does-not-take-ignore-date'Junio C Hamano2014-12-221-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | git-am.txt: --ignore-date flag is not passed to git-applyRonald Wampler2014-12-091-1/+0
* | | | | | | | | Merge branch 'po/doc-assume-unchanged'Junio C Hamano2014-12-222-14/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitignore.txt: do not suggest assume-unchangedMichael J Gruber2014-12-091-4/+0
| * | | | | | | | | doc: make clear --assume-unchanged's user contractPhilip Oakley2014-12-091-10/+8
* | | | | | | | | | Merge branch 'sv/doc-stripspace'Junio C Hamano2014-12-221-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-stripspace: add synopsis for --comment-linesSlavomir Vlcek2014-12-041-0/+1
* | | | | | | | | | | Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'Junio C Hamano2014-12-221-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | check-ignore: clarify treatment of tracked filesMichael J Gruber2014-12-041-0/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/credential-quit'Junio C Hamano2014-12-222-1/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | prompt: respect GIT_TERMINAL_PROMPT to disable terminal promptsJeff King2014-12-041-0/+4
| * | | | | | | | | | | credential: let helpers tell us to quitJeff King2014-12-041-1/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'js/push-to-deploy'Junio C Hamano2014-12-221-0/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | receive-pack: add another option for receive.denyCurrentBranchJohannes Schindelin2014-12-011-0/+7
* | | | | | | | | | | | Merge branch 'pb/send-email-te'Junio C Hamano2014-12-222-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-send-email: add --transfer-encoding optionPaolo Bonzini2014-11-252-0/+11
* | | | | | | | | | | | | Merge branch 'pb/am-message-id-footer'Junio C Hamano2014-12-222-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-am: add --message-id/--no-message-idPaolo Bonzini2014-11-261-0/+11
| * | | | | | | | | | | | | git-mailinfo: add --message-idPaolo Bonzini2014-11-261-0/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano2014-12-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sort_string_list(): rename to string_list_sort()Michael Haggerty2014-11-251-2/+2
* | | | | | | | | | | | | | Merge branch 'jc/refer-to-t-readme-from-submitting-patches'Junio C Hamano2014-12-221-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | SubmittingPatches: refer to t/README for testsJunio C Hamano2014-11-241-1/+2
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Sync with v2.2.1Junio C Hamano2014-12-187-5/+191
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Git 2.2.1v2.2.1Junio C Hamano2014-12-172-1/+36
| * | | | | | | | | | | | | Sync with v2.1.4Junio C Hamano2014-12-176-4/+155
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Git 2.1.4v2.1.4Junio C Hamano2014-12-172-1/+36
| | * | | | | | | | | | | | | Sync with v2.0.5Junio C Hamano2014-12-175-3/+119
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Git 2.0.5v2.0.5Junio C Hamano2014-12-172-1/+36
| | | * | | | | | | | | | | | Sync with v1.9.5Junio C Hamano2014-12-174-2/+83
| | | |\ \ \ \ \ \ \ \ \ \ \ \