summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/fast-export-object-lookup'Junio C Hamano2013-03-251-9/+13
|\
| * fast-export: do not load blob objects twiceJeff King2013-03-171-6/+10
| * fast-export: rename handle_object functionJeff King2013-03-171-3/+3
* | Merge branch 'jk/peel-ref'Junio C Hamano2013-03-252-4/+11
|\ \
| * | upload-pack: load non-tip "want" objects from diskJeff King2013-03-161-2/+2
| * | upload-pack: make sure "want" objects are parsedJeff King2013-03-162-1/+10
| * | upload-pack: drop lookup-before-parse optimizationJeff King2013-03-161-3/+1
* | | Merge branch 'lf/setup-prefix-pathspec'Junio C Hamano2013-03-251-5/+7
|\ \ \
| * | | setup.c: check that the pathspec magic ends with ")"Andrew Wong2013-03-141-2/+3
| * | | setup.c: stop prefix_pathspec() from looping past the end of stringAndrew Wong2013-03-141-3/+4
* | | | Merge branch 'ph/tag-force-no-warn-on-creation'Junio C Hamano2013-03-252-1/+13
|\ \ \ \
| * | | | tag: --force does not have to warn when creating tagsPhil Hord2013-03-132-1/+13
* | | | | Merge branch 'mg/unsigned-time-t'Junio C Hamano2013-03-251-3/+9
|\ \ \ \ \
| * | | | | Fix time offset calculation in case of unsigned time_tMike Gorchak2013-02-251-2/+8
| * | | | | date.c: fix unsigned time_t comparisonMike Gorchak2013-02-251-1/+1
* | | | | | Merge branch 'jk/suppress-clang-warning'Junio C Hamano2013-03-252-2/+4
|\ \ \ \ \ \
| * | | | | | fix clang -Wtautological-compare with unsigned enumAntoine Pelisse2013-02-252-2/+4
* | | | | | | Merge branch 'pw/p4-symlinked-root'Junio C Hamano2013-03-252-7/+63
|\ \ \ \ \ \ \
| * | | | | | | git p4: avoid expanding client paths in chdirMiklós Fazekas2013-03-112-8/+23
| * | | | | | | git p4 test: should honor symlink in p4 client rootPete Wyckoff2013-03-111-0/+27
| * | | | | | | git p4 test: make sure P4CONFIG relative path worksPete Wyckoff2013-03-071-0/+14
* | | | | | | | Merge branch 'jk/empty-archive'Junio C Hamano2013-03-256-13/+109
|\ \ \ \ \ \ \ \
| * | | | | | | | archive: handle commits with an empty treeJeff King2013-03-103-1/+103
| * | | | | | | | test-lib: factor out $GIT_UNZIP setupJeff King2013-03-103-12/+6
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \