Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/conf-var-doc' | Junio C Hamano | 2015-02-22 |
|\ | |||
| * | config.txt: mark deprecated variables more prominently | Junio C Hamano | 2015-01-28 |
| * | config.txt: clarify that add.ignore-errors is deprecated | Junio C Hamano | 2015-01-28 |
* | | Merge branch 'jc/push-to-checkout' | Junio C Hamano | 2015-02-11 |
|\ \ | |||
| * | | receive-pack: support push-to-checkout hook | Junio C Hamano | 2015-01-08 |
* | | | Merge branch 'sb/atomic-push' | Junio C Hamano | 2015-02-11 |
|\ \ \ | |||
| * | | | Document receive.advertiseatomic | Stefan Beller | 2015-01-14 |
* | | | | Merge branch 'po/doc-core-ignorestat' | Junio C Hamano | 2015-01-14 |
|\ \ \ \ | |||
| * | | | | doc: core.ignoreStat update, and clarify the --assume-unchanged effect | Philip Oakley | 2015-01-12 |
| * | | | | doc: core.ignoreStat clarify the --assume-unchanged effect | Philip Oakley | 2014-12-12 |
* | | | | | Merge branch 'lh/send-email-hide-x-mailer' | Junio C Hamano | 2015-01-07 |
|\ \ \ \ \ | |||
| * | | | | | send-email: add --[no-]xmailer option | Luis Henriques | 2014-12-15 |
* | | | | | | Merge branch 'jk/colors' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ | |||
| * | | | | | | parse_color: recognize "no$foo" to clear the $foo attribute | Jeff King | 2014-11-20 |
| * | | | | | | parse_color: support 24-bit RGB values | Jeff King | 2014-11-20 |
* | | | | | | | Merge branch 'js/push-to-deploy' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||
| * | | | | | | receive-pack: add another option for receive.denyCurrentBranch | Johannes Schindelin | 2014-11-30 |
* | | | | | | | Merge branch 'pb/send-email-te' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | git-send-email: add --transfer-encoding option | Paolo Bonzini | 2014-11-25 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Sync with v2.2.1 | Junio C Hamano | 2014-12-18 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||
| * | | | | | | Sync with v2.1.4 | Junio C Hamano | 2014-12-17 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | |||
| | * | | | | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||
| | | * | | | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 |
| | | |\ \ \ | |||
| | | | * \ \ | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 |
| | | | |\ \ \ | |||
| | | | | * | | | read-cache: optionally disallow NTFS .git variants | Johannes Schindelin | 2014-12-17 |
| | | | | * | | | read-cache: optionally disallow HFS+ .git variants | Jeff King | 2014-12-17 |
* | | | | | | | | Merge branch 'jk/colors-fix' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | docs: describe ANSI 256-color mode | Jeff King | 2014-11-20 |
| |/ / / / / | |||
* | | | | | | Sync with maint | Junio C Hamano | 2014-11-10 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||
| * | | | | Documentation/config.txt: fix minor typo | Thomas Quinot | 2014-11-10 |
| * | | | | config.txt: fix typo | Nicolas Dermine | 2014-11-10 |
* | | | | | Documentation: typofixes | Thomas Ackermann | 2014-11-04 |
* | | | | | Merge branch 'rs/grep-color-words' | Junio C Hamano | 2014-10-31 |
|\ \ \ \ \ | |||
| * | | | | | grep: add color.grep.matchcontext and color.grep.matchselected | René Scharfe | 2014-10-28 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'rb/pack-window-memory-config-doc' | Junio C Hamano | 2014-10-29 |
|\ \ \ \ \ | |||
| * | | | | | config.txt: pack.windowmemory limit applies per-thread | Robert de Bath | 2014-10-28 |
* | | | | | | Merge branch 'tb/core-filemode-doc' | Junio C Hamano | 2014-10-24 |
|\ \ \ \ \ \ | |||
| * | | | | | | core.filemode may need manual action | Torsten Bögershausen | 2014-10-19 |
| |/ / / / / | |||
* | | | | | | Merge branch 'da/mergetool-meld' | Junio C Hamano | 2014-10-21 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | mergetools/meld: make usage of `--output` configurable and more robust | David Aguilar | 2014-10-16 |
| |/ / / / | |||
* | | | | | Merge branch 'da/mergetool-temporary-directory' | Junio C Hamano | 2014-10-21 |
|\ \ \ \ \ | |||
| * | | | | | mergetool: add an option for writing to a temporary directory | David Aguilar | 2014-10-16 |
| | |_|/ / | |/| | | | |||
| * | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'jc/push-cert' | Junio C Hamano | 2014-10-08 |
|\ \ \ \ \ \ | |||
| * | | | | | | signed push: allow stale nonce in stateless mode | Junio C Hamano | 2014-09-17 |
| * | | | | | | signed push: fortify against replay attacks | Junio C Hamano | 2014-09-17 |
| * | | | | | | push: the beginning of "git push --signed" | Junio C Hamano | 2014-09-15 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | diff --stat: mark any file larger than core.bigfilethreshold binary | Nguyễn Thái Ngọc Duy | 2014-08-18 |
|/ / / / / | |||
* | | | | | Merge branch 'jk/tag-sort' | Junio C Hamano | 2014-07-23 |
|\ \ \ \ \ | |||
| * | | | | | tag: support configuring --sort via .gitconfig | Jacob Keller | 2014-07-17 |