Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | Merge branch 'af/tcsh-completion-noclobber' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | git-completion.tcsh: fix redirect with noclobberaf/tcsh-completion-noclobber | Ariel Faigon | 2015-06-09 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'pa/auto-gc-mac-osx' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | hooks/pre-auto-gc: adjust power checking for newer OS Xpa/auto-gc-mac-osx | Panagiotis Astithas | 2015-06-12 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint | Junio C Hamano | 2015-07-15 | 2 | -6/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marks | Junio C Hamano | 2015-06-01 | 2 | -6/+14 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-06-25 | 2 | -9/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Revert "stash: require a clean index to apply"jk/stash-require-clean-index | Jeff King | 2015-06-15 | 2 | -9/+0 | |
* | | | | | | | | | | | | | | Merge branch 'cb/array-size' into maint | Junio C Hamano | 2015-06-25 | 1 | -5/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix definition of ARRAY_SIZE for non-gcc buildscb/array-size | Charles Bailey | 2015-06-24 | 1 | -5/+3 | |
* | | | | | | | | | | | | | | | Git 2.4.5v2.4.5 | Junio C Hamano | 2015-06-25 | 4 | -3/+32 | |
* | | | | | | | | | | | | | | | Merge branch 'sg/merge-summary-config' into maint | Junio C Hamano | 2015-06-25 | 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 'jk/make-fix-dependencies' into maint | Junio C Hamano | 2015-06-25 | 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 'sb/pack-protocol-mention-smart-http' into maint | Junio C Hamano | 2015-06-25 | 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/die-on-bogus-worktree-late' into maint | Junio C Hamano | 2015-06-25 | 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 'pt/pull-tags-error-diag' into maint | Junio C Hamano | 2015-06-25 | 1 | -9/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | pull: remove --tags error in no merge candidates casept/pull-tags-error-diag | Paul Tan | 2015-05-14 | 1 | -9/+0 | |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/color-diff-plain-is-context' into maint | Junio C Hamano | 2015-06-25 | 5 | -22/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-context | Jeff King | 2015-05-27 | 4 | -20/+20 | |
| * | | | | | | | | | | | | | | | diff: accept color.diff.context as a synonym for "plain" | Jeff King | 2015-05-27 | 2 | -2/+3 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/diagnose-config-mmap-failure' into maint | Junio C Hamano | 2015-06-25 | 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 | |
| * | | | | | | | | | | | | | | | config.c: avoid xmmap error messages | Jeff King | 2015-05-28 | 3 | -6/+21 | |
| * | | | | | | | | | | | | | | | config.c: fix mmap leak when writing config | Jeff King | 2015-05-28 | 1 | -4/+5 | |
| * | | | | | | | | | | | | | | | read-cache.c: drop PROT_WRITE from mmap of index | Jeff King | 2015-05-28 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint | Junio C Hamano | 2015-06-25 | 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 'mm/rebase-i-post-rewrite-exec' into maint | Junio C Hamano | 2015-06-25 | 2 | -41/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | t5407: use <<- to align the expected outputmm/rebase-i-post-rewrite-exec | Junio C Hamano | 2015-05-22 | 1 | -40/+40 | |
| * | | | | | | | | | | | | | | rebase -i: fix post-rewrite hook with failed exec command | Matthieu Moy | 2015-05-22 | 2 | -6/+6 | |
| * | | | | | | | | | | | | | | rebase -i: demonstrate incorrect behavior of post-rewrite | Matthieu Moy | 2015-05-22 | 1 | -0/+17 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Git 2.4.4v2.4.4 | Junio C Hamano | 2015-06-16 | 4 | -3/+39 | |
* | | | | | | | | | | | | | | Merge branch 'jk/clone-dissociate' into maint | Junio C Hamano | 2015-06-16 | 1 | -13/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | clone: reorder --dissociate and --reference optionsjk/clone-dissociate | Jeff King | 2015-05-27 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | clone: use OPT_STRING_LIST for --reference | Jeff King | 2015-05-27 | 1 | -11/+2 | |
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-doc-intro' into maint | Junio C Hamano | 2015-06-16 | 1 | -28/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | submodule doc: reorder introductory paragraphssb/submodule-doc-intro | Stefan Beller | 2015-05-28 | 1 | -28/+22 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'sb/glossary-submodule' into maint | Junio C Hamano | 2015-06-16 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | glossary: add "remote", "submodule", "superproject"sb/glossary-submodule | Stefan Beller | 2015-05-29 | 1 | -0/+16 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ah/usage-strings' into maint | Junio C Hamano | 2015-06-16 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | blame, log: format usage strings similarly to those in documentationah/usage-strings | Alex Henrie | 2015-05-03 | 2 | -2/+2 |