summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ks/rfc2047-one-char-at-a-time'Junio C Hamano2013-03-254-25/+77
|\
| * format-patch: RFC 2047 says multi-octet character may not be splitKirill Smelkov2013-03-094-25/+77
* | Merge branch 'jk/alias-in-bare'Junio C Hamano2013-03-255-12/+53
|\ \
| * | setup: suppress implicit "." work-tree for bare reposJeff King2013-03-085-0/+41
| * | environment: add GIT_PREFIX to local_repo_envJeff King2013-03-083-2/+4
| * | cache.h: drop LOCAL_REPO_ENV_SIZEJeff King2013-03-082-10/+8
* | | Merge branch 'jc/push-follow-tag'Junio C Hamano2013-03-259-14/+218
|\ \ \
| * | | push: --follow-tagsJunio C Hamano2013-03-057-2/+186
| * | | commit.c: use clear_commit_marks_many() in in_merge_bases_many()Junio C Hamano2013-03-051-2/+1
| * | | commit.c: add in_merge_bases_many()Junio C Hamano2013-03-052-6/+19
| * | | commit.c: add clear_commit_marks_many()Junio C Hamano2013-03-052-6/+14
* | | | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix'Junio C Hamano2013-03-251-1/+1
|\ \ \ \
| * | | | reflog: fix typo in "reflog expire" clean-up codepathJunio C Hamano2013-03-051-1/+1
| |/ / /
* | | | Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano2013-03-252-1/+67
|\ \ \ \
| * | | | tests: make sure rename pretty print worksAntoine Pelisse2013-03-061-0/+54
| * | | | diff: prevent pprint_rename from underrunning inputThomas Rast2013-02-261-7/+10
| * | | | diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse2013-02-231-1/+10
* | | | | Merge branch 'jl/submodule-deinit'Junio C Hamano2013-03-255-3/+198
|\ \ \ \ \
| * | | | | submodule: add 'deinit' commandJens Lehmann2013-03-045-3/+198
* | | | | | Merge branch 'jc/describe'Junio C Hamano2013-03-251-21/+20
|\ \ \ \ \ \
| * | | | | | describe: --match=<pattern> must limit the refs even when used with --allJunio C Hamano2013-02-281-21/+20
* | | | | | | Merge branch 'pe/pull-rebase-v-q'Junio C Hamano2013-03-252-1/+28
|\ \ \ \ \ \ \
| * | | | | | | pull: Apply -q and -v options to rebase mode as wellPeter Eisentraut2013-03-162-1/+28
* | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-252-1/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Start preparing for 1.8.2.1Junio C Hamano2013-03-252-1/+30
| * | | | | | | | Merge branch 'jk/graph-c-expose-symbols-for-cgit' into maintJunio C Hamano2013-03-252-30/+35
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-2510-23/+64
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'lf/bundle-verify-list-prereqs' into maint-1.8.1Junio C Hamano2013-03-251-5/+5
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'tk/doc-filter-branch' into maint-1.8.1Junio C Hamano2013-03-251-2/+25
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1Junio C Hamano2013-03-252-4/+11
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1Junio C Hamano2013-03-251-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/doc-index-format' into maint-1.8.1Junio C Hamano2013-03-253-5/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'wk/doc-pre-rebase' into maint-1.8.1Junio C Hamano2013-03-251-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano2013-03-251-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | transport.c: help gcc 4.6.3 users by squelching compiler warningJunio C Hamano2013-03-251-1/+2
* | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-03-211-0/+76
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-216-14/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | diff.c: diff.renamelimit => diff.renameLimit in messageMax Nanasy2013-03-211-1/+1
| * | | | | | | | | | | | | | | | | wt-status: fix possible use of uninitialized variableJeff King2013-03-211-1/+4
| * | | | | | | | | | | | | | | | | fast-import: clarify "inline" logic in file_change_mJeff King2013-03-211-1/+2
| * | | | | | | | | | | | | | | | | run-command: always set failed_errno in start_commandJeff King2013-03-211-2/+3
| * | | | | | | | | | | | | | | | | transport: drop "int cmp = cmp" hackJeff King2013-03-211-1/+1
| * | | | | | | | | | | | | | | | | drop some obsolete "x = x" compiler warning hacksJeff King2013-03-212-2/+2
| * | | | | | | | | | | | | | | | | fast-import: use pointer-to-pointer to keep list tailJeff King2013-03-211-6/+4
* | | | | | | | | | | | | | | | | | Merge branch 'we/submodule-update-prefix-output'Junio C Hamano2013-03-212-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | submodule update: when using recursion, show full pathWilliam Entriken2013-03-032-14/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/mailsplit-maildir-muttsort'Junio C Hamano2013-03-211-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | mailsplit: sort maildir filenames more cleverlyJeff King2013-03-021-0/+23
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/zip-compresssed-size-with-export-subst'Junio C Hamano2013-03-212-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | archive-zip: fix compressed size for stored export-subst filesRené Scharfe2013-02-272-1/+7