summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-252-1/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-082-1/+9
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jx/blame-align-relative-time' into maintJunio C Hamano2014-06-251-8/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: dynamic blame_date_width for different localesjx/blame-align-relative-timeJiang Xin2014-04-231-1/+8
| * | | | | | | | | | | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-231-7/+14
* | | | | | | | | | | | Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-252-13/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply --ignore-space-change: lines with and without leading whitespaces do no...jc/apply-ignore-whitespaceJunio C Hamano2014-03-262-13/+11
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/complete-merge-pull' into maintJunio C Hamano2014-06-251-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: add missing options for git-mergejk/complete-merge-pullJohn Keeping2014-05-271-1/+4
| * | | | | | | | | | | | completion: add a note that merge options are sharedJohn Keeping2014-05-271-0/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ow/config-mailmap-pathname' into maintJunio C Hamano2014-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | config: respect '~' and '~user' in mailmap.fileow/config-mailmap-pathnameØystein Walle2014-05-271-1/+1
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'as/pretty-truncate' into maintJunio C Hamano2014-06-255-72/+282
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pretty.c: format string with truncate respects logOutputEncodingas/pretty-truncateAlexey Shumkin2014-05-213-8/+13
| * | | | | | | | | | | | t4205, t6006: add tests that fail with i18n.logOutputEncoding setAlexey Shumkin2014-05-212-2/+213
| * | | | | | | | | | | | t4205 (log-pretty-format): use `tformat` rather than `format`Alexey Shumkin2014-05-211-39/+13
| * | | | | | | | | | | | t4041, t4205, t6006, t7102: don't hardcode tested encoding valueAlexey Shumkin2014-05-214-27/+39
| * | | | | | | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin2014-05-191-3/+11
* | | | | | | | | | | | | Merge branch 'jc/revision-dash-count-parsing' into maintJunio C Hamano2014-06-251-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | revision: parse "git log -<count>" more carefullyjc/revision-dash-count-parsingJunio C Hamano2014-06-091-2/+4
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/report-fail-to-read-objects-better' into maintJunio C Hamano2014-06-251-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | open_sha1_file: report "most interesting" errnojk/report-fail-to-read-objects-betterJeff King2014-05-151-1/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'mn/sideband-no-ansi' into maintJunio C Hamano2014-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sideband.c: do not use ANSI control sequence on non-terminalmn/sideband-no-ansiMichael Naumov2014-06-021-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'je/pager-do-not-recurse' into maintJunio C Hamano2014-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pager: do allow spawning pager recursivelyjn/pager-do-not-recurseje/pager-do-not-recurseJörn Engel2014-04-281-1/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2014-06-122-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-wordsJeff King2014-06-042-0/+7
* | | | | | | | | | | | | | pull: do not abuse 'break' inside a shell 'case'Jacek Konieczny2014-06-121-2/+0
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Sync with 1.9.4Junio C Hamano2014-05-302-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Git 1.9.4v1.9.4Junio C Hamano2014-05-304-3/+20
| * | | | | | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-282-20/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-283-20/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | t5537: re-drop http testsJeff King2014-05-301-28/+0
* | | | | | | | | | | | | | | Git 2.0v2.0.0Junio C Hamano2014-05-282-1/+6
| |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-05-211-9/+5
* | | | | | | | | | | | | | Git 2.0-rc4v2.0.0-rc4Junio C Hamano2014-05-201-1/+1
* | | | | | | | | | | | | | RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, do...Jason St. John2014-05-201-36/+37
* | | | | | | | | | | | | | Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Junio C Hamano2014-05-2011-4360/+87
* | | | | | | | | | | | | | Merge branch 'jc/graduate-remote-hg-bzr' (early part)Junio C Hamano2014-05-196-71/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote-helpers: point at their upstream repositoriesJunio C Hamano2014-05-191-0/+19
| * | | | | | | | | | | | | | contrib: remote-helpers: add move warnings (v2.0)Felipe Contreras2014-05-192-0/+6
| * | | | | | | | | | | | | | Revert "Merge branch 'fc/transport-helper-sync-error-fix'"Junio C Hamano2014-05-193-71/+37
* | | | | | | | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-192-20/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-192-20/+42
* | | | | | | | | | | | | | | Merge branch 'lt/request-pull'Junio C Hamano2014-05-192-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | request-pull: resurrect for-linus -> tags/for-linus DWIMJunio C Hamano2014-05-162-1/+13
* | | | | | | | | | | | | | | | Merge branch 'jl/use-vsatisfy-correctly-for-2.0'Junio C Hamano2014-05-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-gui: tolerate major version changes when comparing the git versionjl/use-vsatisfy-correctly-for-2.0Jens Lehmann2014-05-191-2/+2
* | | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-05-191-21/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \