Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rr/submodule-diff-config' | Junio C Hamano | 2012-11-25 | 1 | -1/+43 |
|\ | |||||
| * | diff: rename "set" variable | Jeff King | 2012-11-18 | 1 | -0/+15 |
| * | diff: introduce diff.submodule configuration variable | Ramkumar Ramachandra | 2012-11-18 | 1 | -1/+28 |
* | | Merge branch 'jh/update-ref-d-through-symref' | Junio C Hamano | 2012-11-25 | 1 | -0/+18 |
|\ \ | |||||
| * | | Fix failure to delete a packed ref through a symref | Johan Herland | 2012-10-21 | 1 | -1/+1 |
| * | | t1400-update-ref: Add test verifying bug with symrefs in delete_ref() | Johan Herland | 2012-10-21 | 1 | -0/+18 |
* | | | Merge branch 'lt/diff-stat-show-0-lines' | Junio C Hamano | 2012-11-25 | 3 | -26/+27 |
|\ \ \ | |||||
| * | | | Fix "git diff --stat" for interesting - but empty - file changes | Linus Torvalds | 2012-10-17 | 3 | -26/+27 |
* | | | | Merge branch 'jk/config-ignore-duplicates' | Junio C Hamano | 2012-11-21 | 2 | -131/+188 |
|\ \ \ \ | |||||
| * | | | | git-config: do not complain about duplicate entries | Jeff King | 2012-10-24 | 2 | -4/+5 |
| * | | | | t1300: test "git config --get-all" more thoroughly | Jeff King | 2012-10-24 | 1 | -2/+7 |
| * | | | | t1300: remove redundant test | Jeff King | 2012-10-24 | 1 | -4/+0 |
| * | | | | t1300: style updates | Jeff King | 2012-10-24 | 1 | -123/+178 |
| |/ / / | |||||
* | | | | Merge branch 'cn/config-missing-path' | Junio C Hamano | 2012-11-20 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | config: don't segfault when given --path with a missing value | Carlos Martín Nieto | 2012-11-15 | 1 | -0/+5 |
* | | | | | Merge branch 'mg/replace-resolve-delete' | Junio C Hamano | 2012-11-20 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | replace: parse revision argument for -d | Michael J Gruber | 2012-11-13 | 1 | -0/+11 |
* | | | | | | Merge branch 'jk/maint-gitweb-xss' | Junio C Hamano | 2012-11-20 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: escape html in rss title | Jeff King | 2012-11-12 | 1 | -0/+15 |
* | | | | | | | Merge branch 'pw/maint-p4-rcs-expansion-newline' | Junio C Hamano | 2012-11-20 | 1 | -0/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git p4: RCS expansion should not span newlines | Pete Wyckoff | 2012-11-08 | 1 | -0/+19 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/maint-http-half-auth-fetch' | Junio C Hamano | 2012-11-20 | 2 | -0/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote-curl: retry failed requests for auth even with gzip | Jeff King | 2012-10-31 | 2 | -0/+22 |
* | | | | | | | | Merge branch 'jc/prettier-pretty-note' | Junio C Hamano | 2012-11-15 | 1 | -2/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | format-patch --notes: show notes after three-dashes | Junio C Hamano | 2012-10-17 | 1 | -2/+5 |
| * | | | | | | | | format-patch: append --signature after notes | Junio C Hamano | 2012-10-17 | 1 | -2/+10 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cr/cvsimport-local-zone' | Junio C Hamano | 2012-11-15 | 4 | -0/+338 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-cvsimport: allow author-specific timezones | Chris Rorvick | 2012-10-16 | 4 | -0/+338 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ph/submodule-sync-recursive' | Junio C Hamano | 2012-11-15 | 1 | -2/+53 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add tests for submodule sync --recursive | Phil Hord | 2012-10-29 | 1 | -2/+53 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/maint-diff-grep-textconv' | Junio C Hamano | 2012-11-15 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff_grep: use textconv buffers for add/deleted files | Jeff King | 2012-10-28 | 1 | -0/+12 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jh/symbolic-ref-d' | Junio C Hamano | 2012-11-15 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | git symbolic-ref --delete $symref | Johan Herland | 2012-10-21 | 1 | -0/+30 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ph/maint-submodule-status-fix' | Jeff King | 2012-11-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7407: Fix recursive submodule test | Phil Hord | 2012-10-29 | 1 | -2/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fc/completion-send-email-with-format-patch' | Jeff King | 2012-11-09 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | completion: add format-patch options to send-email | Felipe Contreras | 2012-10-16 | 1 | -0/+5 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mo/cvs-server-cleanup' | Jeff King | 2012-11-09 | 2 | -1/+106 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use character class for sed expression instead of \s | Ben Walton | 2012-10-26 | 1 | -1/+1 |
| * | | | | | | | cvsserver status: provide real sticky info | Matthew Ogilvie | 2012-10-16 | 1 | -0/+35 |
| * | | | | | | | cvsserver: use whole CVS rev number in-process; don't strip "1." prefix | Matthew Ogilvie | 2012-10-16 | 1 | -1/+1 |
| * | | | | | | | cvsserver t9400: add basic 'cvs log' test | Matthew Ogilvie | 2012-10-16 | 1 | -0/+70 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'km/send-email-compose-encoding' | Jeff King | 2012-11-09 | 1 | -0/+86 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-send-email: skip RFC2047 quoting for ASCII subjects | Krzysztof Mazur | 2012-10-25 | 1 | -0/+17 |
| * | | | | | | | git-send-email: use compose-encoding for Subject | Krzysztof Mazur | 2012-10-25 | 1 | -0/+14 |
| * | | | | | | | git-send-email: introduce compose-encoding | Krzysztof Mazur | 2012-10-10 | 1 | -0/+55 |
* | | | | | | | | Merge branch 'js/format-2047' | Jeff King | 2012-11-09 | 2 | -87/+148 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | format-patch tests: check quoting/encoding in To: and Cc: headers | Jan H. Schönherr | 2012-10-18 | 1 | -32/+66 |
| * | | | | | | | | format-patch: fix rfc2047 address encoding with respect to rfc822 specials | Jan H. Schönherr | 2012-10-18 | 1 | -1/+1 |