Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'lt/diff-stat-show-0-lines' into maint | Junio C Hamano | 2012-12-07 |
|\ | |||
| * | t4049: refocus tests | Junio C Hamano | 2012-11-29 |
| * | diff --stat: do not count "unmerged" entries | Junio C Hamano | 2012-11-27 |
| * | diff --stat: move the "total count" logic to the last loop | Junio C Hamano | 2012-11-27 |
| * | test: add failing tests for "diff --stat" to t4049 | Junio C Hamano | 2012-11-27 |
| * | Fix "git diff --stat" for interesting - but empty - file changes | Linus Torvalds | 2012-10-17 |
* | | Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint | Junio C Hamano | 2012-11-28 |
|\ \ | |||
| * | | git p4: RCS expansion should not span newlines | Pete Wyckoff | 2012-11-08 |
* | | | Merge branch 'jh/update-ref-d-through-symref' into maint | Junio C Hamano | 2012-11-27 |
|\ \ \ | |||
| * | | | Fix failure to delete a packed ref through a symref | Johan Herland | 2012-10-21 |
| * | | | t1400-update-ref: Add test verifying bug with symrefs in delete_ref() | Johan Herland | 2012-10-21 |
* | | | | Merge branch 'cn/config-missing-path' into maint | Junio C Hamano | 2012-11-25 |
|\ \ \ \ | |||
| * | | | | config: don't segfault when given --path with a missing value | Carlos Martín Nieto | 2012-11-15 |
* | | | | | Merge branch 'jk/maint-gitweb-xss' into maint | Junio C Hamano | 2012-11-25 |
|\ \ \ \ \ | |||
| * | | | | | gitweb: escape html in rss title | Jeff King | 2012-11-12 |
| | |_|/ / | |/| | | | |||
* | | | | | Merge branch 'jk/maint-diff-grep-textconv' into maint | Junio C Hamano | 2012-11-20 |
|\ \ \ \ \ | |||
| * | | | | | diff_grep: use textconv buffers for add/deleted files | Jeff King | 2012-10-28 |
| |/ / / / | |||
| * | | | | Merge branch 'bw/cp-a-is-gnuism' into maint | Junio C Hamano | 2012-10-17 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'jc/maint-t1450-fsck-order-fix' into maint | Junio C Hamano | 2012-10-17 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'rr/test-use-shell-path-not-shell' into maint | Junio C Hamano | 2012-10-17 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'rr/test-make-sure-we-have-git' into maint | Junio C Hamano | 2012-10-17 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jc/ll-merge-binary-ours' into maint | Junio C Hamano | 2012-10-17 |
| |\ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ | Merge branch 'js/format-2047' into maint | Junio C Hamano | 2012-11-20 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | format-patch tests: check quoting/encoding in To: and Cc: headers | Jan H. Schönherr | 2012-10-18 |
| * | | | | | | | | | | format-patch: fix rfc2047 address encoding with respect to rfc822 specials | Jan H. Schönherr | 2012-10-18 |
| * | | | | | | | | | | format-patch: make rfc2047 encoding more strict | Jan H. Schönherr | 2012-10-18 |
| * | | | | | | | | | | format-patch: do not wrap rfc2047 encoded headers too late | Jan H. Schönherr | 2012-10-18 |
| * | | | | | | | | | | format-patch: do not wrap non-rfc2047 headers too early | Jan H. Schönherr | 2012-10-18 |
| * | | | | | | | | | | utf8: fix off-by-one wrapping of text | Jan H. Schönherr | 2012-10-18 |
* | | | | | | | | | | | Merge branch 'rs/branch-del-symref' into maint | Junio C Hamano | 2012-11-18 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
| * | | | | | | | | | | branch: show targets of deleted symrefs, not sha1s | René Scharfe | 2012-10-18 |
| * | | | | | | | | | | branch: skip commit checks when deleting symref branches | René Scharfe | 2012-10-18 |
| * | | | | | | | | | | branch: delete symref branch, not its target | René Scharfe | 2012-10-18 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'nd/grep-true-path' into maint | Junio C Hamano | 2012-11-18 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | grep: stop looking at random places for .gitattributes | Nguyễn Thái Ngọc Duy | 2012-10-12 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maint | Junio C Hamano | 2012-10-08 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rt/maint-clone-single' into maint | Junio C Hamano | 2012-10-08 |
| |\ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint | Junio C Hamano | 2012-11-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | log --grep: use the same helper to set -E/-F options as "git grep" | Junio C Hamano | 2012-10-09 |
* | | | | | | | | | | | | | Merge branch 'jc/test-say-color-avoid-echo-escape' into maint | Junio C Hamano | 2012-11-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | test-lib: Fix say_color () not to interpret \a\b\c in the message | Junio C Hamano | 2012-10-11 |
* | | | | | | | | | | | | | Merge branch 'bw/cp-a-is-gnuism' | Junio C Hamano | 2012-10-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | tests: "cp -a" is a GNUism | Ben Walton | 2012-10-08 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Merge branch 'rr/maint-submodule-unknown-cmd' into maint | Junio C Hamano | 2012-10-02 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-http-enable-gzip' into maint | Junio C Hamano | 2012-10-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-log-grep-all-match-1' into maint | Junio C Hamano | 2012-09-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-mailinfo-mime-attr' into maint | Junio C Hamano | 2012-09-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | | | | | svn test: escape peg revision separator using empty peg rev | Jonathan Nieder | 2012-10-10 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/maint-t1450-fsck-order-fix' | Junio C Hamano | 2012-10-08 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | t1450: the order the objects are checked is undefined | Junio C Hamano | 2012-10-02 |