Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/grep-patterntype-config' | Junio C Hamano | 2012-08-27 | 1 | -1/+9 |
|\ | |||||
| * | grep: add a grep.patternType configuration setting | J Smith | 2012-08-03 | 1 | -1/+9 |
| * | Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint | Junio C Hamano | 2012-07-30 | 1 | -0/+3 |
| |\ | |||||
* | \ | Merge branch 'pg/maint-1.7.9-am-where-is-patch' | Junio C Hamano | 2012-07-22 | 1 | -0/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | am: indicate where a failed patch is to be found | Paul Gortmaker | 2012-07-13 | 1 | -0/+3 |
* | | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname' | Junio C Hamano | 2012-07-13 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | git on Mac OS and precomposed unicode | Torsten Bögershausen | 2012-07-08 | 1 | -0/+9 |
| | |/ | |/| | |||||
* | | | Merge branch 'mm/config-xdg' | Junio C Hamano | 2012-07-09 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -1/+3 |
| * | | | Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -1/+3 |
| |/ / | |||||
* | | | Fix formatting in git-config(1) | Andreas Schwab | 2012-07-03 | 1 | -7/+9 |
* | | | wt-status.*: better advices for git status added | Lucien Kong | 2012-06-14 | 1 | -3/+4 |
|/ / | |||||
* | | Merge branch 'nd/columns' | Junio C Hamano | 2012-05-03 | 1 | -0/+38 |
|\ \ | |||||
| * | | tag: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+4 |
| * | | status: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+4 |
| * | | branch: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+4 |
| * | | column: add dense layout support | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+4 |
| * | | column: add columnar layout | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+4 |
| * | | Add column layout skeleton and git-column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 1 | -0/+18 |
* | | | doc/config: fix inline literals | Jeff King | 2012-05-03 | 1 | -2/+2 |
* | | | Merge branch 'jk/doc-asciidoc-inline-literal' | Junio C Hamano | 2012-05-02 | 1 | -18/+18 |
|\ \ \ | |||||
| * | | | docs: stop using asciidoc no-inline-literal | Jeff King | 2012-04-26 | 1 | -18/+18 |
* | | | | Merge branch 'mm/simple-push' | Junio C Hamano | 2012-05-02 | 1 | -4/+22 |
|\ \ \ \ | |||||
| * | | | | push.default doc: explain simple after upstream | Junio C Hamano | 2012-04-24 | 1 | -4/+4 |
| * | | | | push: document the future default change for push.default (matching -> simple) | Matthieu Moy | 2012-04-24 | 1 | -2/+6 |
| * | | | | push: introduce new push.default mode "simple" | Matthieu Moy | 2012-04-24 | 1 | -1/+4 |
| * | | | | Undocument deprecated alias 'push.default=tracking' | Matthieu Moy | 2012-04-24 | 1 | -1/+0 |
| * | | | | Documentation: explain push.default option a bit more | Matthieu Moy | 2012-04-24 | 1 | -3/+15 |
* | | | | | Merge branch 'mm/include-userpath' | Junio C Hamano | 2012-04-29 | 1 | -1/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | config: expand tildes in include.path variable | Jeff King | 2012-04-29 | 1 | -1/+4 |
| |/ / / | |||||
* | | | | push: Provide situational hints for non-fast-forward errors | Christopher Tiwald | 2012-03-19 | 1 | -2/+17 |
|/ / / | |||||
* | | | Merge branch 'maint' | Junio C Hamano | 2012-03-04 | 1 | -3/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | http.proxy: also mention https_proxy and all_proxy | Clemens Buchacher | 2012-03-04 | 1 | -3/+4 |
* | | | Merge branch 'maint' | Junio C Hamano | 2012-03-01 | 1 | -5/+7 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Documentation fixes in git-config | Libor Pechacek | 2012-03-01 | 1 | -5/+7 |
* | | config: add include directive | Jeff King | 2012-02-17 | 1 | -0/+15 |
|/ | |||||
* | Sync with maint | Junio C Hamano | 2012-01-10 | 1 | -1/+2 |
|\ | |||||
| * | Merge the attributes fix in from maint-1.6.7 branch | Junio C Hamano | 2012-01-10 | 1 | -1/+2 |
| |\ | |||||
| | * | Merge the attributes fix in from maint-1.6.6 branch | Junio C Hamano | 2012-01-10 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Documentation: rerere's rr-cache auto-creation and rerere.enabled | Junio C Hamano | 2012-01-10 | 1 | -1/+2 |
* | | | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * | | | | gpg-interface: allow use of a custom GPG binaryjc/signed-commit | Junio C Hamano | 2011-11-29 | 1 | -0/+11 |
* | | | | | Sync with 1.7.8.3 | Junio C Hamano | 2012-01-06 | 1 | -4/+4 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-06 | 1 | -4/+4 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-06 | 1 | -4/+4 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Documentation: rerere.enabled is the primary way to configure rerere | Thomas Rast | 2012-01-06 | 1 | -4/+4 |
| | * | | | Merge branch 'cn/eradicate-working-copy' into maint | Junio C Hamano | 2011-10-26 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'maint-1.7.6' into maint | Junio C Hamano | 2011-10-26 | 1 | -1/+2 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge branch 'tr/doc-note-rewrite' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -1/+2 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'jn/doc-dashdash' into maint | Junio C Hamano | 2011-09-11 | 1 | -1/+1 |
| | | |\ \ \ \ |