Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fc/send-email-annotate' | Junio C Hamano | 2013-04-18 | 1 | -0/+6 |
|\ | |||||
| * | format-patch: add format.coverLetter configuration variable | Felipe Contreras | 2013-04-07 | 1 | -0/+5 |
| * | send-email: make annotate configurable | Felipe Contreras | 2013-04-07 | 1 | -0/+1 |
* | | remote.c: introduce branch.<name>.pushremote | Ramkumar Ramachandra | 2013-04-02 | 1 | -4/+15 |
* | | remote.c: introduce remote.pushdefault | Ramkumar Ramachandra | 2013-04-02 | 1 | -3/+10 |
|/ | |||||
* | Merge branch 'maint' | Junio C Hamano | 2013-03-28 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-28 | 1 | -1/+1 |
| |\ | |||||
| | * | git help config: s/insn/instruction/ | Matthias Krüger | 2013-03-28 | 1 | -1/+1 |
| * | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint | Junio C Hamano | 2013-03-26 | 1 | -1/+1 |
| |\ \ | |||||
* | \ \ | Merge branch 'jc/fetch-raw-sha1' | Junio C Hamano | 2013-03-21 | 1 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | upload-pack: optionally allow fetching from the tips of hidden refs | Junio C Hamano | 2013-02-07 | 1 | -1/+7 |
* | | | | | Merge branch 'tb/document-status-u-tradeoff' | Junio C Hamano | 2013-03-21 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | status: advise to consider use of -u when read_directory takes too long | Nguyễn Thái Ngọc Duy | 2013-03-16 | 1 | -0/+4 |
| * | | | | | Documentation: move diff.wordRegex from config.txt to diff-config.txt | Ramkumar Ramachandra | 2012-12-27 | 1 | -6/+0 |
* | | | | | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' | Junio C Hamano | 2013-03-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Fix ".git/refs" stragglers | Greg Price | 2013-02-24 | 1 | -1/+1 |
* | | | | | Sync with 'maint' | Junio C Hamano | 2013-02-25 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'jc/mention-tracking-for-pull-default' into maint | Junio C Hamano | 2013-02-25 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * | | | | | Documentation: "advice" is uncountable | Greg Price | 2013-02-25 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'ss/help-htmlpath-config-doc' into maint | Junio C Hamano | 2013-01-28 | 1 | -0/+6 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jc/mention-tracking-for-pull-default' | Junio C Hamano | 2013-02-18 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | doc: mention tracking for pull.default | Junio C Hamano | 2013-01-31 | 1 | -1/+2 |
* | | | | | | Merge branch 'jc/hidden-refs' | Junio C Hamano | 2013-02-17 | 1 | -0/+23 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | upload/receive-pack: allow hiding ref hierarchies | Junio C Hamano | 2013-02-07 | 1 | -0/+23 |
* | | | | | | Merge branch 'ta/doc-no-small-caps' | Junio C Hamano | 2013-02-05 | 1 | -56/+56 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: the name of the system is 'Git', not 'git' | Thomas Ackermann | 2013-02-01 | 1 | -56/+56 |
* | | | | | | | Merge branch 'jc/push-reject-reasons' | Junio C Hamano | 2013-02-04 | 1 | -1/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE | Junio C Hamano | 2013-01-24 | 1 | -1/+11 |
* | | | | | | | | Merge branch 'jc/custom-comment-char' | Junio C Hamano | 2013-02-04 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow custom "comment char" | Junio C Hamano | 2013-01-16 | 1 | -0/+6 |
* | | | | | | | | | Enable minimal stat checking | Robin Rosenberg | 2013-01-22 | 1 | -0/+6 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'rt/commit-cleanup-config' | Junio C Hamano | 2013-01-20 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit: make default of "cleanup" option configurable | Ralf Thielow | 2013-01-10 | 1 | -0/+9 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ap/log-mailmap' | Junio C Hamano | 2013-01-20 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | log: add log.mailmap configuration option | Antoine Pelisse | 2013-01-10 | 1 | -0/+4 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ss/help-htmlpath-config-doc' | Junio C Hamano | 2013-01-18 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | config.txt: Document help.htmlpath config parameter | Sebastian Staudt | 2013-01-15 | 1 | -0/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'nd/maint-branch-desc-doc' | Junio C Hamano | 2013-01-09 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | config.txt: a few lines about branch.<name>.description | Nguyễn Thái Ngọc Duy | 2013-01-01 | 1 | -0/+6 |
| |/ / / / | |||||
* | | | | | Merge branch 'wk/submodule-update-remote' | Junio C Hamano | 2013-01-05 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | submodule update: add --remote for submodule's upstream changes | W. Trevor King | 2012-12-19 | 1 | -0/+6 |
* | | | | | | Merge branch 'jk/mailmap-from-blob' | Junio C Hamano | 2013-01-05 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mailmap: default mailmap.blob in bare repositories | Jeff King | 2012-12-13 | 1 | -3/+5 |
| * | | | | | | mailmap: support reading mailmap from blobs | Jeff King | 2012-12-12 | 1 | -0/+6 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'cr/push-force-tag-update' | Junio C Hamano | 2013-01-05 | 1 | -3/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | push: allow already-exists advice to be disabled | Chris Rorvick | 2012-12-03 | 1 | -2/+6 |
| * | | | | push: rename config variable for more general use | Chris Rorvick | 2012-12-03 | 1 | -1/+1 |
* | | | | | Merge branch 'mm/status-push-pull-advise' | Junio C Hamano | 2012-12-04 | 1 | -2/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | document that statusHints affects git checkout | Matthieu Moy | 2012-12-04 | 1 | -2/+3 |
| | |_|/ | |/| | | |||||
* | | | | Documentation: move diff.wordRegex from config.txt to diff-config.txt | Ramkumar Ramachandra | 2012-11-18 | 1 | -6/+0 |
| |/ / |/| | |