Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Further preparation for 1.8.0.1 | Junio C Hamano | 2012-11-20 | 1 | -1/+7 | |
* | | | | | | Merge branch 'mg/maint-pull-suggest-upstream-to' into maint | Junio C Hamano | 2012-11-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | push/pull: adjust missing upstream help text to changed interface | Michael J Gruber | 2012-11-08 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'mm/maint-doc-commit-edit' into maint | Junio C Hamano | 2012-11-20 | 1 | -0/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Document 'git commit --no-edit' explicitly | Matthieu Moy | 2012-11-02 | 1 | -0/+5 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint | Junio C Hamano | 2012-11-20 | 1 | -4/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | commit: fixup misplacement of --no-post-rewrite description | Andreas Schwab | 2012-11-02 | 1 | -4/+3 | |
* | | | | | | | Merge branch 'rs/lock-correct-ref-during-delete' into maint | Junio C Hamano | 2012-11-20 | 1 | -13/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | refs: lock symref that is to be deleted, not its target | René Scharfe | 2012-10-16 | 1 | -13/+5 | |
* | | | | | | | | Merge branch 'rf/maint-mailmap-off-by-one' into maint | Junio C Hamano | 2012-11-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | mailmap: avoid out-of-bounds memory access | Romain Francoise | 2012-10-28 | 1 | -1/+1 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'jk/maint-diff-grep-textconv' into maint | Junio C Hamano | 2012-11-20 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | diff_grep: use textconv buffers for add/deleted files | Jeff King | 2012-10-28 | 2 | -2/+14 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'js/format-2047' into maint | Junio C Hamano | 2012-11-20 | 5 | -126/+262 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | 2 | -18/+33 | |
| * | | | | | | | | format-patch: make rfc2047 encoding more strict | Jan H. Schönherr | 2012-10-18 | 3 | -12/+72 | |
| * | | | | | | | | format-patch: introduce helper function last_line_length() | Jan H. Schönherr | 2012-10-18 | 1 | -12/+13 | |
| * | | | | | | | | format-patch: do not wrap rfc2047 encoded headers too late | Jan H. Schönherr | 2012-10-18 | 2 | -33/+51 | |
| * | | | | | | | | format-patch: do not wrap non-rfc2047 headers too early | Jan H. Schönherr | 2012-10-18 | 2 | -27/+35 | |
| * | | | | | | | | utf8: fix off-by-one wrapping of text | Jan H. Schönherr | 2012-10-18 | 2 | -3/+3 | |
* | | | | | | | | | Start preparing for 1.8.0.1 | Junio C Hamano | 2012-11-18 | 2 | -1/+47 | |
* | | | | | | | | | Merge branch 'sz/maint-curl-multi-timeout' into maint | Junio C Hamano | 2012-11-18 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix potential hang in https handshake | Stefan Zager | 2012-10-19 | 1 | -0/+12 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'po/maint-refs-replace-docs' into maint | Junio C Hamano | 2012-11-18 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Doc repository-layout: Show refs/replace | Philip Oakley | 2012-10-25 | 1 | -0/+6 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'ph/pull-rebase-detached' into maint | Junio C Hamano | 2012-11-18 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | git-pull: Avoid merge-base on detached head | Phil Hord | 2012-10-25 | 1 | -0/+1 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'mm/maint-doc-remote-tracking' into maint | Junio C Hamano | 2012-11-18 | 4 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Documentation: remote tracking branch -> remote-tracking branch | Matthieu Moy | 2012-10-25 | 4 | -6/+6 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'rs/branch-del-symref' into maint | Junio C Hamano | 2012-11-18 | 2 | -26/+68 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| * | | | | | | | | branch: show targets of deleted symrefs, not sha1s | René Scharfe | 2012-10-18 | 2 | -11/+13 | |
| * | | | | | | | | branch: skip commit checks when deleting symref branches | René Scharfe | 2012-10-18 | 2 | -2/+17 | |
| * | | | | | | | | branch: delete symref branch, not its target | René Scharfe | 2012-10-18 | 2 | -1/+12 | |
| * | | | | | | | | branch: factor out delete_branch_config() | René Scharfe | 2012-10-18 | 1 | -5/+10 | |
| * | | | | | | | | branch: factor out check_branch_commit() | René Scharfe | 2012-10-18 | 1 | -12/+21 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'nd/grep-true-path' into maint | Junio C Hamano | 2012-11-18 | 4 | -17/+51 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | grep: stop looking at random places for .gitattributes | Nguyễn Thái Ngọc Duy | 2012-10-12 | 4 | -17/+51 | |
* | | | | | | | | | Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint | Junio C Hamano | 2012-11-18 | 5 | -128/+204 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | log --grep: use the same helper to set -E/-F options as "git grep" | Junio C Hamano | 2012-10-09 | 2 | -2/+8 | |
| * | | | | | | | | | revisions: initialize revs->grep_filter using grep_init() | Junio C Hamano | 2012-10-09 | 2 | -2/+9 | |
| * | | | | | | | | | grep: move pattern-type bits support to top-level grep.[ch] | Junio C Hamano | 2012-10-09 | 3 | -39/+45 | |
| * | | | | | | | | | grep: move the configuration parsing logic to grep.[ch] | Junio C Hamano | 2012-10-09 | 3 | -131/+134 | |
| * | | | | | | | | | builtin/grep.c: make configuration callback more reusable | Junio C Hamano | 2012-10-09 | 1 | -25/+79 | |
* | | | | | | | | | | Merge branch 'da/mergetools-p4' into maint | Junio C Hamano | 2012-11-18 | 1 | -0/+25 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | mergetools/p4merge: Handle "/dev/null" | David Aguilar | 2012-10-11 | 1 | -0/+25 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jc/test-say-color-avoid-echo-escape' into maint | Junio C Hamano | 2012-11-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | test-lib: Fix say_color () not to interpret \a\b\c in the message | Junio C Hamano | 2012-10-11 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'bw/config-lift-variable-name-length-limit' into maint | Junio C Hamano | 2012-11-18 | 1 | -30/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Remove the hard coded length limit on variable names in config files | Ben Walton | 2012-10-01 | 1 | -30/+29 |