Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'cb/rebase-am-exit-code' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | rebase: return non-zero error code if format-patch failscb/rebase-am-exit-code | Clemens Buchacher | 2015-07-08 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/index-pack-reduce-recheck' into maint | Junio C Hamano | 2015-07-27 | 3 | -3/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheck | Jeff King | 2015-06-09 | 3 | -3/+14 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Git 2.4.6v2.4.6 | Junio C Hamano | 2015-07-15 | 4 | -3/+27 | |
* | | | | | | | | | | | | Merge branch 'mm/describe-doc' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Documentation/describe: improve one-line summarymm/describe-doc | Matthieu Moy | 2015-06-16 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jc/prompt-document-ps1-state-separator' into maint | Junio C Hamano | 2015-07-15 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | git-prompt.sh: document GIT_PS1_STATESEPARATORjc/prompt-document-ps1-state-separator | Joe Cridge | 2015-06-10 | 1 | -0/+4 | |
* | | | | | | | | | | | | | Merge branch 'es/osx-header-pollutes-mask-macro' into maint | Junio C Hamano | 2015-07-15 | 4 | -29/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | ewah: use less generic macro namees/osx-header-pollutes-mask-macro | Jeff King | 2015-06-03 | 4 | -23/+23 | |
| * | | | | | | | | | | | | | ewah/bitmap: silence warning about MASK macro redefinition | Eric Sunshine | 2015-06-03 | 1 | -8/+8 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'es/utf8-stupid-compiler-workaround' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | utf8: NO_ICONV: silence uninitialized variable warninges/utf8-stupid-compiler-workaround | Eric Sunshine | 2015-06-05 | 1 | -1/+3 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'fk/doc-format-patch-vn' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | doc: format-patch: fix typofk/doc-format-patch-vn | Frans Klaver | 2015-06-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'pt/t0302-needs-sanity' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanity | Paul Tan | 2015-06-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'me/fetch-into-shallow-safety' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | fetch-pack: check for shallow if depth givenme/fetch-into-shallow-safety | Mike Edgar | 2015-06-17 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries' into maint | Junio C Hamano | 2015-07-15 | 1 | -14/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | fsck: report errors if reflog entries point at invalid objectsmh/fsck-reflog-entries | Michael Haggerty | 2015-06-08 | 1 | -4/+9 | |
| * | | | | | | | | | | | | | | | fsck_handle_reflog_sha1(): new function | Michael Haggerty | 2015-06-08 | 1 | -14/+15 | |
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |