summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Fifth batch for 2.3 cycleJunio C Hamano2015-01-141-2/+27
* | | | | | | | Merge branch 'po/doc-core-ignorestat'Junio C Hamano2015-01-141-8/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: core.ignoreStat update, and clarify the --assume-unchanged effectpo/doc-core-ignorestatPhilip Oakley2015-01-121-9/+13
| * | | | | | | | doc: core.ignoreStat clarify the --assume-unchanged effectPhilip Oakley2014-12-121-4/+5
* | | | | | | | | Merge branch 'rc/for-each-ref-tracking'Junio C Hamano2015-01-142-2/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | for-each-ref: always check stat_tracking_info()'s return valuerc/for-each-ref-trackingRaphael Kubo da Costa2015-01-122-2/+22
* | | | | | | | | | Merge branch 'rh/autoconf-rhel3'Junio C Hamano2015-01-145-1/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | configure.ac: check for HMAC_CTX_cleanuprh/autoconf-rhel3Reuben Hawkins2015-01-093-0/+13
| * | | | | | | | | | configure.ac: check for clock_gettime and CLOCK_MONOTONICReuben Hawkins2015-01-094-1/+30
| * | | | | | | | | | configure.ac: check 'tv_nsec' field in 'struct stat'Reuben Hawkins2015-01-091-0/+13
* | | | | | | | | | | Merge branch 'ak/fewer-includes'Junio C Hamano2015-01-142-7/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cat-file: remove unused includesak/fewer-includesAlexander Kuleshov2015-01-091-4/+0
| * | | | | | | | | | | git.c: remove unnecessary #includesAlexander Kuleshov2015-01-091-3/+0
* | | | | | | | | | | | Merge branch 'ak/doc-add-v-n-options'Junio C Hamano2015-01-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: list long options for -v and -nak/doc-add-v-n-optionsAlexander Kuleshov2015-01-091-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ak/show-branch-usage-string'Junio C Hamano2015-01-141-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | show-branch: line-wrap show-branch usageAlexander Kuleshov2015-01-081-1/+4
* | | | | | | | | | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano2015-01-141-44/+48
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | test-lib.sh: do tests for color support after changing HOMERichard Hansen2015-01-071-43/+47
| * | | | | | | | | | | | test-lib: use 'test ...' instead of '[ ... ]'Richard Hansen2015-01-071-3/+3
* | | | | | | | | | | | | Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano2015-01-141-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-prompt: preserve value of $? in all casestf/prompt-preserve-exit-statusTony Finch2015-01-141-4/+4
* | | | | | | | | | | | | | Merge branch 'rh/hide-prompt-in-ignored-directory'Junio C Hamano2015-01-142-7/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-prompt.sh: allow to hide prompt for ignored pwdrh/hide-prompt-in-ignored-directoryJess Austin2015-01-072-0/+119
| * | | | | | | | | | | | | | git-prompt.sh: if pc mode, immediately set PS1 to a plain promptRichard Hansen2015-01-071-7/+4
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mm/complete-rebase-autostash'Junio C Hamano2015-01-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-completion: add --autostash for 'git rebase'mm/complete-rebase-autostashMatthieu Moy2015-01-071-0/+1
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'aw/doc-smtp-ssl-cert-path'Junio C Hamano2015-01-141-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | correct smtp-ssl-cert-path descriptionaw/doc-smtp-ssl-cert-pathAdam Williamson2015-01-071-4/+9
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'sp/subtree-doc'Junio C Hamano2015-01-141-105/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | subtree: fix AsciiDoc list item continuationsp/subtree-docSteffen Prohaska2015-01-061-105/+89
* | | | | | | | | | | | | | | Merge branch 'km/log-usage-string-i18n'Junio C Hamano2015-01-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | log.c: fix translation markingskm/log-usage-string-i18nKyle J. McKay2015-01-061-2/+2
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'km/imap-send-libcurl-options'Junio C Hamano2015-01-141-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRYKyle J. McKay2015-01-061-2/+2
| * | | | | | | | | | | | | | | imap-send.c: support GIT_CURL_VERBOSEKyle J. McKay2015-01-061-1/+1
* | | | | | | | | | | | | | | | Merge branch 'jk/prune-packed-server-info'Junio C Hamano2015-01-142-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | update-server-info: create info/* with mode 0666jk/prune-packed-server-infoJeff King2015-01-062-1/+11
| * | | | | | | | | | | | | | | | t1301: set umask in reflog sharedrepository=group testJeff King2015-01-061-0/+1
* | | | | | | | | | | | | | | | | Merge branch 'js/remote-add-with-insteadof'Junio C Hamano2015-01-142-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add a regression test for 'git remote add <existing> <same-url>'js/remote-add-with-insteadofJohannes Schindelin2014-12-231-0/+5
| * | | | | | | | | | | | | | | | git remote: allow adding remotes agreeing with url.<...>.insteadOfJohannes Schindelin2014-12-231-1/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Git 2.3.0-rc0v2.3.0-rc0Junio C Hamano2015-01-122-1/+18
* | | | | | | | | | | | | | | | Sync with 2.2.2Junio C Hamano2015-01-122-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Git 2.2.2v2.2.2Junio C Hamano2015-01-123-2/+33
| * | | | | | | | | | | | | | | Merge branch 'jk/read-packed-refs-without-path-max' into maintJunio C Hamano2015-01-121-21/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-122-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/find-uniq-abbrev' into maintJunio C Hamano2015-01-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maintJunio C Hamano2015-01-122-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rw/apply-does-not-take-ignore-date' into maintJunio C Hamano2015-01-121-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \