Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'sb/test-bitmap-free-at-end' into maint | Junio C Hamano | 2015-06-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint | Junio C Hamano | 2015-06-16 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-backend-deadlock' into maint | Junio C Hamano | 2015-06-16 | 3 | -29/+139 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/filter-empty-contents' into maint | Junio C Hamano | 2015-06-16 | 2 | -1/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/stash-options' into maint | Junio C Hamano | 2015-06-16 | 2 | -1/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/log-format-raw-doc' into maint | Junio C Hamano | 2015-06-16 | 2 | -2/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maint | Junio C Hamano | 2015-06-16 | 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 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/slim-index-pack-memory-usage' | Junio C Hamano | 2015-06-16 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | index-pack: fix truncation of off_t in comparisonnd/slim-index-pack-memory-usage | Jeff King | 2015-06-04 | 1 | -2/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/pack-protocol-mention-smart-http' | Junio C Hamano | 2015-06-16 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/technical/pack-protocol: mention http as possible protocolsb/pack-protocol-mention-smart-http | Stefan Beller | 2015-06-02 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/make-fix-dependencies' | Junio C Hamano | 2015-06-16 | 1 | -24/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: silence perl/PM.stamp recipejk/make-fix-dependencies | Jeff King | 2015-05-29 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS | Jeff King | 2015-05-29 | 1 | -21/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: drop dependency between git-instaweb and gitweb | Jeff King | 2015-05-29 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/die-on-bogus-worktree-late' | Junio C Hamano | 2015-06-16 | 2 | -10/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | setup_git_directory: delay core.bare/core.worktree errorsjk/die-on-bogus-worktree-late | Jeff King | 2015-05-29 | 2 | -10/+26 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/merge-summary-config' | Junio C Hamano | 2015-06-16 | 3 | -16/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: include 'merge.branchdesc' for merge and config as wellsg/merge-summary-config | SZEDER Gábor | 2015-05-28 | 3 | -16/+12 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/send-email-sendmail-alias' | Junio C Hamano | 2015-06-16 | 3 | -2/+70 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | t9001: write $HOME/, not ~/, to help shells without tilde expansionah/send-email-sendmail-alias | Junio C Hamano | 2015-05-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | send-email: add sendmail email aliases format | Allen Hubbe | 2015-05-27 | 3 | -1/+69 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Second half of seventh batch | Junio C Hamano | 2015-06-11 | 1 | -0/+28 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/complete-sequencing' | Junio C Hamano | 2015-06-11 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | completion: suggest sequencer commands for reverttb/complete-sequencing | Thomas Braun | 2015-06-01 | 1 | -0/+5 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' | Junio C Hamano | 2015-06-11 | 7 | -9/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | suppress errors on missing UNINTERESTING linksjk/squelch-missing-link-warning-for-unreachable | Jeff King | 2015-06-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | silence broken link warnings with revs->ignore_missing_links | Jeff King | 2015-06-01 | 3 | -2/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | add quieter versions of parse_{tree,commit} | Jeff King | 2015-06-01 | 4 | -6/+16 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-tests' | Junio C Hamano | 2015-06-11 | 2 | -36/+175 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | t5520: check reflog action in fast-forward mergept/pull-tests | Paul Tan | 2015-05-29 | 1 | -3/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t5521: test --dry-run does not make any changes | Paul Tan | 2015-05-29 | 1 | -0/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t5520: test --rebase failure on unborn branch with index | Paul Tan | 2015-05-29 | 1 | -0/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t5520: test --rebase with multiple branches | Paul Tan | 2015-05-29 | 1 | -0/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t5520: test work tree fast-forward when fetch updates head | Paul Tan | 2015-05-29 | 1 | -0/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t5520: test for failure if index has unresolved entries | Paul Tan | 2015-05-29 | 1 | -0/+19 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t5520: test no merge candidates cases | Paul Tan | 2015-05-18 | 1 | -0/+55 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t5520: prevent field splitting in content comparisons | Paul Tan | 2015-05-18 | 1 | -35/+35 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/glossary-submodule' | Junio C Hamano | 2015-06-11 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | glossary: add "remote", "submodule", "superproject"sb/glossary-submodule | Stefan Beller | 2015-05-29 | 1 | -0/+16 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-doc-intro' | Junio C Hamano | 2015-06-11 | 1 | -28/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | submodule doc: reorder introductory paragraphssb/submodule-doc-intro | Stefan Beller | 2015-05-28 | 1 | -28/+22 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diagnose-config-mmap-failure' | Junio C Hamano | 2015-06-11 | 4 | -11/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | xmmap(): drop "Out of memory?"jk/diagnose-config-mmap-failure | Junio C Hamano | 2015-05-28 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | config.c: rewrite ENODEV into EISDIR when mmap fails | Jeff King | 2015-05-28 | 1 | -0/+2 |