Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |\ \ \ \ | |||||
* | | | \ \ \ \ | Merge branch 'jc/advice-doc' | Junio C Hamano | 2011-12-20 | 1 | -11/+8 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | advice: Document that they all default to truejc/advice-doc | Junio C Hamano | 2011-12-18 | 1 | -11/+8 |
* | | | | | | | | Merge branch 'jk/credentials' | Junio C Hamano | 2011-12-19 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | docs: end-user documentation for the credential subsystem | Jeff King | 2011-12-11 | 1 | -0/+23 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ab/pull-rebase-config' | Junio C Hamano | 2011-12-09 | 1 | -4/+16 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-config | Ævar Arnfjörð Bjarmason | 2011-11-07 | 1 | -4/+16 |
* | | | | | | | | Merge branch 'po/insn-editor' | Junio C Hamano | 2011-10-21 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | "rebase -i": support special-purpose editor to edit insn sheet | Peter Oberndorfer | 2011-10-17 | 1 | -0/+6 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cn/doc-config-bare-subsection' | Junio C Hamano | 2011-10-21 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Documentation: update [section.subsection] to reflect what git doescn/doc-config-bare-subsection | Carlos Martín Nieto | 2011-10-16 | 1 | -3/+4 |
* | | | | | | | | Merge branch 'jn/gitweb-manpages' | Junio C Hamano | 2011-10-18 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: Add gitweb config variables to git-config(1) | Jakub Narebski | 2011-10-16 | 1 | -0/+17 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cn/eradicate-working-copy' | Junio C Hamano | 2011-10-05 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Remove 'working copy' from the documentation and C code | Carlos Martín Nieto | 2011-09-21 | 1 | -3/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'tr/doc-note-rewrite' | Junio C Hamano | 2011-10-05 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Documentation: basic configuration of notes.rewriteRef | Thomas Rast | 2011-09-13 | 1 | -1/+2 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'bw/log-all-ref-updates-doc' into maint | Junio C Hamano | 2011-08-16 | 1 | -1/+3 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/fetch-pack-fsck-objects' | Junio C Hamano | 2011-10-05 | 1 | -1/+14 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | transfer.fsckobjects: unify fetch/receive.fsckobjects | Junio C Hamano | 2011-09-04 | 1 | -2/+9 |
| * | | | | | fetch.fsckobjects: verify downloaded objects | Junio C Hamano | 2011-09-04 | 1 | -0/+6 |
* | | | | | | Merge branch 'bw/log-all-ref-updates-doc' | Junio C Hamano | 2011-07-22 | 1 | -1/+3 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Documentation: clearly specify what refs are honored by core.logAllRefUpdates | Bert Wesarg | 2011-07-12 | 1 | -1/+3 |
* | | | | | | Merge branch 'jn/doc-dashdash' | Junio C Hamano | 2011-07-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash | Junio C Hamano | 2011-06-29 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Documentation: quote double-dash for AsciiDoc | Jonathan Nieder | 2011-06-29 | 1 | -1/+1 |
* | | | | | | http: pass http.cookiefile using CURLOPT_COOKIEFILE | Duncan Brown | 2011-06-03 | 1 | -0/+8 |
|/ / / / / | |||||
* | | | | | Add log.abbrevCommit config variable | Jay Soffian | 2011-05-18 | 1 | -0/+5 |
* | | | | | Merge branch 'ci/commit--interactive-atomic' | Junio C Hamano | 2011-05-16 | 1 | -3/+4 |
|\ \ \ \ \ |