summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | diffcore-rename: avoid processing duplicate destinationsjk/diffcore-rename-duplicateJeff King2015-02-272-2/+85
| * | | | | | | | | | | | | | | | | | diffcore-rename: split locate_rename_dst into two functionsJeff King2015-02-271-12/+26
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #8)Junio C Hamano2015-03-061-1/+25
* | | | | | | | | | | | | | | | | | Merge branch 'bw/kwset-use-unsigned'Junio C Hamano2015-03-064-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | kwset: use unsigned char to store values with high-bit setbw/kwset-use-unsignedBen Walton2015-03-024-7/+7
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ak/t5516-typofix'Junio C Hamano2015-03-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | t5516: correct misspelled pushInsteadOfak/t5516-typofixAnders Kaseorg2015-03-031-1/+1
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ms/submodule-update-config-doc'Junio C Hamano2015-03-063-37/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | submodule: improve documentation of update subcommandms/submodule-update-config-docMichal Sojka2015-03-023-37/+64
* | | | | | | | | | | | | | | | Merge branch 'ja/clean-confirm-i18n'Junio C Hamano2015-03-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add hint interactive cleaningja/clean-confirm-i18nJean-Noel Avila2015-03-021-1/+2
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'mk/diff-shortstat-dirstat-fix'Junio C Hamano2015-03-062-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | diff --shortstat --dirstat: remove duplicate outputmk/diff-shortstat-dirstat-fixMårten Kongstad2015-03-022-1/+15
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'mg/doc-remote-tags-or-not'Junio C Hamano2015-03-061-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | git-remote.txt: describe behavior without --tags and --no-tagsmg/doc-remote-tags-or-notMichael J Gruber2015-03-021-0/+3
* | | | | | | | | | | | | | | Merge branch 'nd/grep-exclude-standard-help-fix'Junio C Hamano2015-03-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | grep: correct help string for --exclude-standardnd/grep-exclude-standard-help-fixNguyễn Thái Ngọc Duy2015-02-271-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mr/doc-clean-f-f'Junio C Hamano2015-03-061-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Documentation/git-clean.txt: document that -f may need to be given twicemr/doc-clean-f-fMikko Rapeli2015-02-261-2/+6
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ye/http-accept-language'Junio C Hamano2015-03-063-26/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gettext.c: move get_preferred_languages() from http.cye/http-accept-languageJeff King2015-02-263-25/+28
* | | | | | | | | | | | | | Sync with 2.3.2Junio C Hamano2015-03-063-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Git 2.3.2v2.3.2Junio C Hamano2015-03-063-2/+14
| * | | | | | | | | | | | | Merge branch 'rj/no-xopen-source-for-cygwin' into maintJunio C Hamano2015-03-061-6/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/simple-cleanups' into maintJunio C Hamano2015-03-064-13/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/am-c-doc' into maintJunio C Hamano2015-03-062-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/svn-maint-fixes' into maintJunio C Hamano2015-03-063-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/send-email-getopt-long-workarounds' into maintJunio C Hamano2015-03-062-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2015-03-051-0/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Prepare for 2.3.2Junio C Hamano2015-03-052-1/+69
| * | | | | | | | | | | | | | | | | | Merge branch 'sb/plug-leak-in-make-cache-entry' into maintJunio C Hamano2015-03-051-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fast-import-die-nicely-fix' into maintJunio C Hamano2015-03-051-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano2015-03-051-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano2015-03-052-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/submodule-sanitize-path-upon-add' into maintJunio C Hamano2015-03-052-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/prune-mtime' into maintJunio C Hamano2015-03-053-13/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maintJunio C Hamano2015-03-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/squelch-openssl-warnings-on-macosx' into maintJunio C Hamano2015-03-051-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2015-03-052-8/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'av/wincred-with-at-in-username-fix' into maintJunio C Hamano2015-03-051-3/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ch/new-gpg-drops-rfc-1991' into maintJunio C Hamano2015-03-052-0/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/remote-set-url-doc' into maintJunio C Hamano2015-03-051-6/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-bitmap' into maintJunio C Hamano2015-03-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-no-ungetc-eof' into maintJunio C Hamano2015-03-052-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/decimal-width-for-uintmax' into maintJunio C Hamano2015-03-052-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/push-cert' into maintJunio C Hamano2015-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/deref-symref-over-helper-transport' into maintJunio C Hamano2015-03-053-6/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano2015-03-052-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano2015-03-054-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maintJunio C Hamano2015-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \