Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | use file_exists() to check if a file exists in the worktree | René Scharfe | 2015-05-20 | 5 | -22/+9 | |
* | | | | | | | | | | Merge branch 'sb/test-bitmap-free-at-end' into maint | Junio C Hamano | 2015-06-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | test_bitmap_walk: free bitmap with bitmap_freesb/test-bitmap-free-at-end | Jeff King | 2015-05-22 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint | Junio C Hamano | 2015-06-16 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | clean: only lstat files in pathspecdt/clean-pathspec-filter-then-lstat | David Turner | 2015-05-18 | 1 | -3/+3 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'jk/http-backend-deadlock' into maint | Junio C Hamano | 2015-06-16 | 3 | -29/+139 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlock | Junio C Hamano | 2015-05-25 | 3 | -29/+139 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3 | Junio C Hamano | 2015-05-25 | 3 | -29/+139 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2 | Jeff King | 2015-05-25 | 3 | -11/+105 | |
| | | * | | | | | | | | | | t5551: factor out tag creation | Jeff King | 2015-05-20 | 1 | -13/+21 | |
| | | * | | | | | | | | | | http-backend: fix die recursion with custom handler | Jeff King | 2015-05-15 | 1 | -5/+9 | |
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jh/filter-empty-contents' into maint | Junio C Hamano | 2015-06-16 | 2 | -1/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contents | Jim Hill | 2015-05-18 | 2 | -1/+27 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/stash-options' into maint | Junio C Hamano | 2015-06-16 | 2 | -1/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | stash: recognize "--help" for subcommandsjk/stash-options | Jeff King | 2015-05-20 | 1 | -0/+11 | |
| * | | | | | | | | | | | | stash: complain about unknown flags | Jeff King | 2015-05-20 | 2 | -1/+9 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'mm/log-format-raw-doc' into maint | Junio C Hamano | 2015-06-16 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Documentation/log: clarify sha1 non-abbreviation in log --rawmm/log-format-raw-doc | Matthieu Moy | 2015-05-20 | 1 | -1/+4 | |
| * | | | | | | | | | | | | Documentation/log: clarify what --raw means | Matthieu Moy | 2015-05-18 | 1 | -1/+10 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maint | Junio C Hamano | 2015-06-16 | 1 | -1/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deri...ep/do-not-feed-a-pointer-to-array-size | Elia Pinto | 2015-05-05 | 1 | -1/+53 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po int... | Junio C Hamano | 2015-06-14 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | l10n: de.po: translation fix for fall-back to 3way merge | Michael J Gruber | 2015-06-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | l10n: de.po: punctuation fixes | Michael J Gruber | 2015-06-12 | 1 | -2/+2 | |
| * | | | | | | | | | | | l10n: de.po: grammar fix | Michael J Gruber | 2015-06-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | l10n: de.po: change error message from "sagen" to "Meinten Sie" | Phillip Sz | 2015-06-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | Git 2.4.3v2.4.3 | Junio C Hamano | 2015-06-05 | 4 | -3/+80 | |
* | | | | | | | | | | | | Merge branch 'dl/branch-error-message' into maint | Junio C Hamano | 2015-06-05 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | branch: do not call a "remote-tracking branch" a "remote branch"dl/branch-error-message | Danny Lin | 2015-05-06 | 1 | -3/+3 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/skip-http-tests-under-no-curl' into maint | Junio C Hamano | 2015-06-05 | 8 | -35/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | tests: skip dav http-push tests under NO_EXPAT=NoThanksjk/skip-http-tests-under-no-curl | Junio C Hamano | 2015-05-07 | 2 | -0/+7 | |
| * | | | | | | | | | | | | t/lib-httpd.sh: skip tests if NO_CURL is defined | Jeff King | 2015-05-07 | 7 | -35/+6 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file' into maint | Junio C Hamano | 2015-06-05 | 3 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | doc: fix inconsistent spelling of "packfile"ps/doc-packfile-vs-pack-file | Patrick Steinhardt | 2015-05-22 | 2 | -3/+3 | |
| * | | | | | | | | | | | | pack-protocol.txt: fix insconsistent spelling of "packfile" | Patrick Steinhardt | 2015-05-17 | 1 | -3/+3 | |
| * | | | | | | | | | | | | git-unpack-objects.txt: fix inconsistent spelling of "packfile" | Patrick Steinhardt | 2015-05-17 | 1 | -2/+2 | |
| * | | | | | | | | | | | | git-verify-pack.txt: fix inconsistent spelling of "packfile" | Patrick Steinhardt | 2015-05-17 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'fg/document-commit-message-stripping' into maint | Junio C Hamano | 2015-06-05 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Documentation: clarify how "git commit" cleans up the edited log messagefg/document-commit-message-stripping | Fredrik Gustafsson | 2015-04-27 | 1 | -4/+7 | |
* | | | | | | | | | | | | | Merge branch 'jk/rerere-forget-check-enabled' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | rerere: exit silently on "forget" when rerere is disabledjk/rerere-forget-check-enabled | Jeff King | 2015-05-14 | 1 | -0/+2 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'pt/pull-log-n' into maint | Junio C Hamano | 2015-06-05 | 2 | -2/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | pull: handle --log=<n>pt/pull-log-n | Paul Tan | 2015-05-18 | 2 | -2/+19 | |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' into maint | Junio C Hamano | 2015-06-05 | 3 | -2/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | pull: parse pull.ff as a bool or stringpt/pull-ff-vs-merge-ff | Paul Tan | 2015-05-18 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | pull: make pull.ff=true override merge.ff | Paul Tan | 2015-05-18 | 3 | -1/+12 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint | Junio C Hamano | 2015-06-05 | 1 | -5/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsrs/plug-leak-in-pack-bitmaps | René Scharfe | 2015-05-19 | 1 | -5/+3 | |
* | | | | | | | | | | | | | | Merge branch 'ja/tutorial-asciidoctor-fix' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | doc: fix unmatched code fencesja/tutorial-asciidoctor-fix | Jean-Noel Avila | 2015-05-12 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |