Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | blame: fix broken time_buf paddings in relative timestamp | Jiang Xin | 2014-04-23 | 1 | -7/+14 | |
* | | | | | | | | | | | | Merge branch 'jc/apply-ignore-whitespace' into maint | Junio C Hamano | 2014-06-25 | 2 | -13/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | apply --ignore-space-change: lines with and without leading whitespaces do no...jc/apply-ignore-whitespace | Junio C Hamano | 2014-03-26 | 2 | -13/+11 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/complete-merge-pull' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | completion: add missing options for git-mergejk/complete-merge-pull | John Keeping | 2014-05-27 | 1 | -1/+4 | |
| * | | | | | | | | | | | | completion: add a note that merge options are shared | John Keeping | 2014-05-27 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ow/config-mailmap-pathname' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | config: respect '~' and '~user' in mailmap.fileow/config-mailmap-pathname | Øystein Walle | 2014-05-27 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'as/pretty-truncate' into maint | Junio C Hamano | 2014-06-25 | 5 | -72/+282 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | pretty.c: format string with truncate respects logOutputEncodingas/pretty-truncate | Alexey Shumkin | 2014-05-21 | 3 | -8/+13 | |
| * | | | | | | | | | | | | t4205, t6006: add tests that fail with i18n.logOutputEncoding set | Alexey Shumkin | 2014-05-21 | 2 | -2/+213 | |
| * | | | | | | | | | | | | t4205 (log-pretty-format): use `tformat` rather than `format` | Alexey Shumkin | 2014-05-21 | 1 | -39/+13 | |
| * | | | | | | | | | | | | t4041, t4205, t6006, t7102: don't hardcode tested encoding value | Alexey Shumkin | 2014-05-21 | 4 | -27/+39 | |
| * | | | | | | | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs | Alexey Shumkin | 2014-05-19 | 1 | -3/+11 | |
* | | | | | | | | | | | | | Merge branch 'jc/revision-dash-count-parsing' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | revision: parse "git log -<count>" more carefullyjc/revision-dash-count-parsing | Junio C Hamano | 2014-06-09 | 1 | -2/+4 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/report-fail-to-read-objects-better' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | open_sha1_file: report "most interesting" errnojk/report-fail-to-read-objects-better | Jeff King | 2014-05-15 | 1 | -1/+5 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'mn/sideband-no-ansi' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | sideband.c: do not use ANSI control sequence on non-terminalmn/sideband-no-ansi | Michael Naumov | 2014-06-02 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'je/pager-do-not-recurse' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | pager: do allow spawning pager recursivelyjn/pager-do-not-recurseje/pager-do-not-recurse | Jörn Engel | 2014-04-28 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint | Junio C Hamano | 2014-06-12 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-words | Jeff King | 2014-06-04 | 2 | -0/+7 | |
* | | | | | | | | | | | | | | pull: do not abuse 'break' inside a shell 'case' | Jacek Konieczny | 2014-06-12 | 1 | -2/+0 | |
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Sync with 1.9.4 | Junio C Hamano | 2014-05-30 | 2 | -1/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Git 1.9.4v1.9.4 | Junio C Hamano | 2014-05-30 | 4 | -3/+20 | |
| * | | | | | | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-28 | 2 | -20/+42 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mw/symlinks' into maint | Junio C Hamano | 2014-05-28 | 3 | -20/+112 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | t5537: re-drop http tests | Jeff King | 2014-05-30 | 1 | -28/+0 | |
* | | | | | | | | | | | | | | | Git 2.0v2.0.0 | Junio C Hamano | 2014-05-28 | 2 | -1/+6 | |
| |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-05-21 | 1 | -9/+5 | |
* | | | | | | | | | | | | | | Git 2.0-rc4v2.0.0-rc4 | Junio C Hamano | 2014-05-20 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, do... | Jason St. John | 2014-05-20 | 1 | -36/+37 | |
* | | | | | | | | | | | | | | Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)" | Junio C Hamano | 2014-05-20 | 11 | -4360/+87 | |
* | | | | | | | | | | | | | | Merge branch 'jc/graduate-remote-hg-bzr' (early part) | Junio C Hamano | 2014-05-19 | 6 | -71/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | remote-helpers: point at their upstream repositories | Junio C Hamano | 2014-05-19 | 1 | -0/+19 | |
| * | | | | | | | | | | | | | | contrib: remote-helpers: add move warnings (v2.0) | Felipe Contreras | 2014-05-19 | 2 | -0/+6 | |
| * | | | | | | | | | | | | | | Revert "Merge branch 'fc/transport-helper-sync-error-fix'" | Junio C Hamano | 2014-05-19 | 3 | -71/+37 | |
* | | | | | | | | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' | Junio C Hamano | 2014-05-19 | 2 | -20/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refname | Richard Hansen | 2014-05-19 | 2 | -20/+42 | |
* | | | | | | | | | | | | | | | Merge branch 'lt/request-pull' | Junio C Hamano | 2014-05-19 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | request-pull: resurrect for-linus -> tags/for-linus DWIM | Junio C Hamano | 2014-05-16 | 2 | -1/+13 | |
* | | | | | | | | | | | | | | | | Merge branch 'jl/use-vsatisfy-correctly-for-2.0' | Junio C Hamano | 2014-05-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | git-gui: tolerate major version changes when comparing the git versionjl/use-vsatisfy-correctly-for-2.0 | Jens Lehmann | 2014-05-19 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2014-05-19 | 1 | -21/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | fr: a lot of good fixups | Grégoire Paris | 2014-05-17 | 1 | -21/+21 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'kb/fast-hashmap' | Junio C Hamano | 2014-05-19 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Documentation/technical/api-hashmap: remove source highlightingkb/fast-hashmap | Anders Kaseorg | 2014-05-19 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | | | | Merge branch 'fc/prompt-zsh-read-from-file' | Junio C Hamano | 2014-05-13 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |