aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jk/stash-options' into maintJunio C Hamano2015-06-16
|\
| * stash: recognize "--help" for subcommandsJeff King2015-05-20
| * stash: complain about unknown flagsJeff King2015-05-20
* | Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2015-06-16
|\ \
| * | Documentation/log: clarify sha1 non-abbreviation in log --rawMatthieu Moy2015-05-20
| * | Documentation/log: clarify what --raw meansMatthieu Moy2015-05-18
* | | Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintJunio C Hamano2015-06-16
|\ \ \
| * | | git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deri...Elia Pinto2015-05-05
| | |/ | |/|
* | | Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po int...Junio C Hamano2015-06-14
|\ \ \
| * | | l10n: de.po: translation fix for fall-back to 3way mergeMichael J Gruber2015-06-12
| * | | l10n: de.po: punctuation fixesMichael J Gruber2015-06-12
| * | | l10n: de.po: grammar fixMichael J Gruber2015-06-12
| * | | l10n: de.po: change error message from "sagen" to "Meinten Sie"Phillip Sz2015-06-12
* | | | Git 2.4.3v2.4.3Junio C Hamano2015-06-05
* | | | Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-05
|\ \ \ \
| * | | | branch: do not call a "remote-tracking branch" a "remote branch"Danny Lin2015-05-06
| | |/ / | |/| |
* | | | Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-05
|\ \ \ \
| * | | | tests: skip dav http-push tests under NO_EXPAT=NoThanksJunio C Hamano2015-05-07
| * | | | t/lib-httpd.sh: skip tests if NO_CURL is definedJeff King2015-05-07
| | |_|/ | |/| |
* | | | Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-05
|\ \ \ \
| * | | | doc: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-22
| * | | | pack-protocol.txt: fix insconsistent spelling of "packfile"Patrick Steinhardt2015-05-17
| * | | | git-unpack-objects.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-17
| * | | | git-verify-pack.txt: fix inconsistent spelling of "packfile"Patrick Steinhardt2015-05-17
| | |/ / | |/| |
* | | | Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano2015-06-05
|\ \ \ \
| * | | | Documentation: clarify how "git commit" cleans up the edited log messageFredrik Gustafsson2015-04-27
* | | | | Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano2015-06-05
|\ \ \ \ \
| * | | | | rerere: exit silently on "forget" when rerere is disabledJeff King2015-05-14
| | |_|/ / | |/| | |
* | | | | Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-05
|\ \ \ \ \
| * | | | | pull: handle --log=<n>Paul Tan2015-05-18
* | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \
| * | | | | | pull: parse pull.ff as a bool or stringPaul Tan2015-05-18
| * | | | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-18
* | | | | | | Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \
| * | | | | | | pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsRené Scharfe2015-05-19
* | | | | | | | Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: fix unmatched code fencesJean-Noel Avila2015-05-12
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: fix unmatched code fences in git-stripspaceJeff King2015-05-12
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: convert AsciiDoc {?foo} to ifdef::foo[]Jeff King2015-05-14
| * | | | | | | | doc: put example URLs and emails inside literal backticksJeff King2015-05-12
| * | | | | | | | doc: drop backslash quoting of some curly bracesJeff King2015-05-12
| * | | | | | | | doc: convert \--option to --optionJeff King2015-05-12
| * | | | | | | | doc/add: reformat `--edit` optionJeff King2015-05-12
| * | | | | | | | doc: fix length of underlined section-titleJeff King2015-05-12
| * | | | | | | | doc: fix hanging "+"-continuationJeff King2015-05-12
| * | | | | | | | doc: fix unquoted use of "{type}"Jeff King2015-05-12
| * | | | | | | | doc: fix misrendering due to `single quote'Jeff King2015-05-12
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \