Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kk/maint-commit-tree' | Junio C Hamano | 2012-07-23 | 1 | -1/+1 |
|\ | |||||
| * | Revert "git-commit-tree(1): update synopsis" | Junio C Hamano | 2012-07-17 | 1 | -1/+1 |
* | | Merge branch 'jk/mediawiki-credential' | Junio C Hamano | 2012-07-23 | 1 | -6/+16 |
|\ \ | |||||
| * | | credential: convert "url" attribute into its parsed subparts | Jeff King | 2012-07-18 | 1 | -0/+12 |
| * | | docs/credential: minor clarity fixups | Jeff King | 2012-07-18 | 1 | -6/+4 |
* | | | Merge branch 'sn/doc-typofix' | Junio C Hamano | 2012-07-23 | 5 | -10/+10 |
|\ \ \ | |||||
| * | | | doc: A few minor copy edits. | Štěpán Němec | 2012-07-14 | 5 | -10/+10 |
* | | | | Update draft release notes to 1.7.12 | Junio C Hamano | 2012-07-22 | 1 | -56/+24 |
* | | | | Sync with 1.7.11.3 | Junio C Hamano | 2012-07-22 | 2 | -1/+55 |
|\ \ \ \ | |||||
| * | | | | Git 1.7.11.3v1.7.11.3 | Junio C Hamano | 2012-07-22 | 2 | -1/+55 |
* | | | | | 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 'ms/daemon-doc-typo' | Junio C Hamano | 2012-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/git-daemon: add missing word | Michael Schubert | 2012-07-16 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jc/sha1-name-more' | Junio C Hamano | 2012-07-22 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-parse --disambiguate=<prefix> | Junio C Hamano | 2012-07-09 | 1 | -0/+6 |
* | | | | | | | | Update draft release notes for 7th batch | Junio C Hamano | 2012-07-15 | 1 | -0/+34 |
* | | | | | | | | Merge branch 'jc/apply-3way' | Junio C Hamano | 2012-07-15 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | apply: document --3way option | Junio C Hamano | 2012-07-09 | 1 | -1/+10 |
* | | | | | | | | | Merge branch 'cw/rebase-i-root' | Junio C Hamano | 2012-07-15 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase -i: support --root without --onto | Chris Webb | 2012-06-26 | 1 | -4/+5 |
* | | | | | | | | | | Merge branch 'pw/git-p4-move' | Junio C Hamano | 2012-07-15 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | git p4: refactor diffOpts calculation | Gary Gibbons | 2012-07-05 | 1 | -4/+6 |
* | | | | | | | | | | Sixth batch for 1.7.12 | Junio C Hamano | 2012-07-13 | 1 | -0/+33 |
* | | | | | | | | | | 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 |
* | | | | | | | | | | Reduce draft release notes to 1.7.12 | Junio C Hamano | 2012-07-11 | 1 | -61/+0 |
* | | | | | | | | | | Sync with 1.7.11.2 | Junio C Hamano | 2012-07-11 | 2 | -1/+55 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Git 1.7.11.2v1.7.11.2 | Junio C Hamano | 2012-07-11 | 2 | -1/+55 |
| * | | | | | | | | | Merge branch 'cn/cherry-pick-range-docs' into maint | Junio C Hamano | 2012-07-11 | 2 | -1/+13 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Fifth batch for 1.7.12 | Junio C Hamano | 2012-07-09 | 1 | -0/+43 |
* | | | | | | | | | | Merge branch 'mm/credential-plumbing' | Junio C Hamano | 2012-07-09 | 2 | -36/+147 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git credential fill: output the whole 'struct credential' | Matthieu Moy | 2012-06-25 | 1 | -4/+12 |
| * | | | | | | | | | | add 'git credential' plumbing command | Javier Roucher Iglesias | 2012-06-25 | 2 | -36/+139 |
* | | | | | | | | | | | Merge branch 'mm/config-xdg' | Junio C Hamano | 2012-07-09 | 4 | -7/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | config: write to $XDG_CONFIG_HOME/git/config file when appropriate | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -1/+2 |
| * | | | | | | | | | | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 2 | -1/+5 |
| * | | | | | | | | | | | Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 2 | -2/+6 |
| * | | | | | | | | | | | config: read (but not write) from $XDG_CONFIG_HOME/git/config file | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -3/+11 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Fourth batch for 1.7.12 | Junio C Hamano | 2012-07-04 | 1 | -0/+15 |
* | | | | | | | | | | | Fix formatting in git-config(1) | Andreas Schwab | 2012-07-03 | 1 | -7/+9 |
* | | | | | | | | | | | Third batch for 1.7.12 | Junio C Hamano | 2012-06-28 | 1 | -0/+43 |
* | | | | | | | | | | | Merge branch 'lk/more-helpful-status-hints' | Junio C Hamano | 2012-06-28 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | wt-status.*: better advices for git status added | Lucien Kong | 2012-06-14 | 1 | -3/+4 |
* | | | | | | | | | | | | Merge branch 'lk/rebase-i-x' | Junio C Hamano | 2012-06-28 | 1 | -3/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | rebase -i: teach "--exec <cmd>" | Lucien Kong | 2012-06-13 | 1 | -3/+42 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Second batch for 1.7.12 | Junio C Hamano | 2012-06-25 | 1 | -10/+20 |
* | | | | | | | | | | | Merge branch 'cn/cherry-pick-range-docs' | Junio C Hamano | 2012-06-25 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | git-cherry-pick.txt: clarify the use of revision range notation | Carlos Martín Nieto | 2012-06-15 | 1 | -1/+12 |
| * | | | | | | | | | | Documentation: --no-walk is no-op if range is specified | Carlos Martín Nieto | 2012-06-15 | 1 | -0/+1 |