Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/colors' | Junio C Hamano | 2014-12-22 | 1 | -2/+4 |
|\ | |||||
| * | parse_color: recognize "no$foo" to clear the $foo attribute | Jeff King | 2014-11-20 | 1 | -1/+2 |
| * | parse_color: support 24-bit RGB values | Jeff King | 2014-11-20 | 1 | -1/+2 |
* | | Merge branch 'js/push-to-deploy' | Junio C Hamano | 2014-12-22 | 1 | -0/+7 |
|\ \ | |||||
| * | | receive-pack: add another option for receive.denyCurrentBranch | Johannes Schindelin | 2014-12-01 | 1 | -0/+7 |
* | | | Merge branch 'pb/send-email-te' | Junio C Hamano | 2014-12-22 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | git-send-email: add --transfer-encoding option | Paolo Bonzini | 2014-11-25 | 1 | -0/+1 |
* | | | | Sync with v2.2.1 | Junio C Hamano | 2014-12-18 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * \ \ \ | Sync with v2.1.4 | Junio C Hamano | 2014-12-17 | 1 | -0/+11 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 | 1 | -0/+11 |
| | |\ \ \ | |||||
| | | * \ \ | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 | 1 | -0/+11 |
| | | |\ \ \ | |||||
| | | | * \ \ | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 | 1 | -0/+11 |
| | | | |\ \ \ | |||||
| | | | | * | | | read-cache: optionally disallow NTFS .git variants | Johannes Schindelin | 2014-12-17 | 1 | -0/+6 |
| | | | | * | | | read-cache: optionally disallow HFS+ .git variants | Jeff King | 2014-12-17 | 1 | -0/+5 |
* | | | | | | | | Merge branch 'jk/colors-fix' | Junio C Hamano | 2014-12-12 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | docs: describe ANSI 256-color mode | Jeff King | 2014-11-20 | 1 | -0/+4 |
| |/ / / / / | |||||
* | | | | / | Sync with maint | Junio C Hamano | 2014-11-10 | 1 | -2/+2 |
|\| | | | | | |_|_|_|/ |/| | | | | |||||
| * | | | | Documentation/config.txt: fix minor typo | Thomas Quinot | 2014-11-10 | 1 | -1/+1 |
| * | | | | config.txt: fix typo | Nicolas Dermine | 2014-11-10 | 1 | -1/+1 |
* | | | | | Documentation: typofixes | Thomas Ackermann | 2014-11-04 | 1 | -5/+5 |
* | | | | | Merge branch 'rs/grep-color-words' | Junio C Hamano | 2014-10-31 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | grep: add color.grep.matchcontext and color.grep.matchselected | René Scharfe | 2014-10-28 | 1 | -1/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'rb/pack-window-memory-config-doc' | Junio C Hamano | 2014-10-29 | 1 | -4/+5 |
|\ \ \ \ \ | |||||
| * | | | | | config.txt: pack.windowmemory limit applies per-thread | Robert de Bath | 2014-10-28 | 1 | -4/+5 |
* | | | | | | Merge branch 'tb/core-filemode-doc' | Junio C Hamano | 2014-10-24 | 1 | -6/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | core.filemode may need manual action | Torsten Bögershausen | 2014-10-20 | 1 | -6/+19 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'da/mergetool-meld' | Junio C Hamano | 2014-10-21 | 1 | -0/+9 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | mergetools/meld: make usage of `--output` configurable and more robust | David Aguilar | 2014-10-16 | 1 | -0/+9 |
| |/ / / / | |||||
* | | | | | Merge branch 'da/mergetool-temporary-directory' | Junio C Hamano | 2014-10-21 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | mergetool: add an option for writing to a temporary directory | David Aguilar | 2014-10-16 | 1 | -0/+6 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+6 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jc/push-cert' | Junio C Hamano | 2014-10-08 | 1 | -0/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | signed push: allow stale nonce in stateless mode | Junio C Hamano | 2014-09-18 | 1 | -0/+13 |
| * | | | | | | signed push: fortify against replay attacks | Junio C Hamano | 2014-09-17 | 1 | -6/+6 |
| * | | | | | | push: the beginning of "git push --signed" | Junio C Hamano | 2014-09-15 | 1 | -0/+6 |
| | |_|/ / / | |/| | | | | |||||
* / | | | | | diff --stat: mark any file larger than core.bigfilethreshold binary | Nguyễn Thái Ngọc Duy | 2014-08-18 | 1 | -1/+2 |
|/ / / / / | |||||
* | | | | | Merge branch 'jk/tag-sort' | Junio C Hamano | 2014-07-23 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | tag: support configuring --sort via .gitconfig | Jacob Keller | 2014-07-17 | 1 | -0/+5 |
* | | | | | | Merge branch 'jk/repack-pack-writebitmaps-config' | Junio C Hamano | 2014-06-25 | 1 | -7/+10 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | repack: introduce repack.writeBitmaps config option | Jeff King | 2014-06-10 | 1 | -7/+10 |
* | | | | | | Merge branch 'sh/enable-preloadindex' | Junio C Hamano | 2014-06-16 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | environment.c: enable core.preloadindex by default | Steve Hoelzer | 2014-06-03 | 1 | -2/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jm/format-patch-mail-sig' | Junio C Hamano | 2014-06-16 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | format-patch: add "--signature-file=<file>" option | Jeremiah Mahler | 2014-05-27 | 1 | -0/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' | Junio C Hamano | 2014-06-16 | 1 | -2/+6 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | status/commit: show staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 | 1 | -2/+6 |
* | | | | | | Merge branch 'jj/command-line-adjective' | Junio C Hamano | 2014-06-06 | 1 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: use "command-line" when used as a compound adjective, and fix ... | Jason St. John | 2014-05-21 | 1 | -5/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: allow core.commentChar=auto for character auto selection | Nguyễn Thái Ngọc Duy | 2014-05-19 | 1 | -0/+3 |
| |/ / / / / |