summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | submodule: print graph output next to submodule logJohn Keeping2013-04-053-4/+11
* | | | | | | | | | | Merge branch 'jk/diff-algo-finishing-touches'Junio C Hamano2013-04-152-2/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: allow unstuck arguments with --diff-algorithmJohn Keeping2013-04-051-2/+3
| * | | | | | | | | | | git-merge(1): document diff-algorithm option to merge-recursiveJohn Keeping2013-04-051-0/+6
* | | | | | | | | | | | Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-152-7/+29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow2013-04-071-4/+8
| * | | | | | | | | | | | fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2013-04-072-3/+21
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'lf/bundle-with-tip-wo-message'Junio C Hamano2013-04-152-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | bundle: Accept prerequisites without commit messagesLukas Fleischer2013-04-072-1/+11
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/show-branch-strbuf'Junio C Hamano2013-04-151-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | show-branch: use strbuf instead of static bufferJeff King2013-04-061-9/+8
* | | | | | | | | | | | | Merge branch 'jk/http-error-messages'Junio C Hamano2013-04-154-23/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | http: drop http_error functionJeff King2013-04-063-11/+1
| * | | | | | | | | | | | remote-curl: die directly with http error messagesJeff King2013-04-061-2/+1
| * | | | | | | | | | | | http: re-word http error messageJeff King2013-04-061-1/+1
| * | | | | | | | | | | | http: simplify http_error helper functionJeff King2013-04-064-12/+8
| * | | | | | | | | | | | remote-curl: consistently report repo url for http errorsJeff King2013-04-061-2/+2
| * | | | | | | | | | | | remote-curl: always show friendlier 404 messageJeff King2013-04-061-4/+2
| * | | | | | | | | | | | remote-curl: let servers override http 404 adviceJeff King2013-04-061-1/+2
| * | | | | | | | | | | | remote-curl: show server content on http errorsJeff King2013-04-061-1/+32
| * | | | | | | | | | | | http: add HTTP_KEEP_ERROR optionJeff King2013-04-062-0/+38
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tr/perl-keep-stderr-open'Junio C Hamano2013-04-152-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t9700: do not close STDERRThomas Rast2013-04-041-1/+2
| * | | | | | | | | | | | perl: redirect stderr to /dev/null instead of closingThomas Rast2013-04-041-3/+3
* | | | | | | | | | | | | Merge branch 'po/help-guides'Junio C Hamano2013-04-141-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | help: mark common_guides[] as translatableSimon Ruderich2013-04-121-7/+7
* | | | | | | | | | | | | | test-bzr: portable shell and utf-8 strings for Mac OSTorsten Bögershausen2013-04-121-19/+19
* | | | | | | | | | | | | | Sync with 'maint'Junio C Hamano2013-04-1249-85/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'rr/test-3200-style' into maintJunio C Hamano2013-04-121-253/+267
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/texinfo-5' into maintJunio C Hamano2013-04-121-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diffcore-break-divzero' into maintJunio C Hamano2013-04-121-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/commit-amend-doc' into maintJunio C Hamano2013-04-121-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'jk/bisect-prn-unsigned' into maintJunio C Hamano2013-04-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/no-more-self-assignment' into maintJunio C Hamano2013-04-122-47/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/send-email-perl-critique' into maintJunio C Hamano2013-04-121-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maintJunio C Hamano2013-04-121-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-1224-33/+33
| * | | | | | | | | | | | | | | | | | | kwset: fix spelling in commentsStefano Lattarini2013-04-121-2/+2
| * | | | | | | | | | | | | | | | | | | precompose-utf8: fix spelling of "want" in error messageStefano Lattarini2013-04-121-1/+1
| * | | | | | | | | | | | | | | | | | | compat/nedmalloc: fix spelling in commentsStefano Lattarini2013-04-121-3/+3
| * | | | | | | | | | | | | | | | | | | compat/regex: fix spelling and grammar in commentsStefano Lattarini2013-04-123-6/+6
| * | | | | | | | | | | | | | | | | | | obstack: fix spelling of similarStefano Lattarini2013-04-121-1/+1
| * | | | | | | | | | | | | | | | | | | contrib/subtree: fix spelling of accidentallyStefano Lattarini2013-04-121-1/+1
| * | | | | | | | | | | | | | | | | | | git-remote-mediawiki: spelling fixesStefano Lattarini2013-04-124-14/+14
| * | | | | | | | | | | | | | | | | | | doc: various spelling fixesStefano Lattarini2013-04-1210-13/+13
| * | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-04-122-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | fast-export: fix argument name in error messagesPaul Price2013-04-121-2/+2
| | * | | | | | | | | | | | | | | | | | | Documentation: distinguish between ref and offset deltas in pack-formatStefan Saasen2013-04-121-1/+3
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-121-8/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | i18n: make the translation of -u advice in one goJiang Xin2013-04-121-8/+4