aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fully-peeled-packed-ref'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | pack-refs: add fully-peeled traitMichael Haggerty2013-03-18
| * | | | | | | | | | | | | | | | | | | | pack-refs: write peeled entry for non-tagsJeff King2013-03-17
| * | | | | | | | | | | | | | | | | | | | use parse_object_or_die instead of die("bad object")Jeff King2013-03-17
| * | | | | | | | | | | | | | | | | | | | avoid segfaults on parse_object failureJeff King2013-03-17
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fast-export-object-lookup'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | fast-export: do not load blob objects twiceJeff King2013-03-17
| * | | | | | | | | | | | | | | | | | | | fast-export: rename handle_object functionJeff King2013-03-17
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/peel-ref'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | upload-pack: load non-tip "want" objects from diskJeff King2013-03-16
| * | | | | | | | | | | | | | | | | | | | | upload-pack: make sure "want" objects are parsedJeff King2013-03-16
| * | | | | | | | | | | | | | | | | | | | | upload-pack: drop lookup-before-parse optimizationJeff King2013-03-16
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'lf/setup-prefix-pathspec'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | setup.c: check that the pathspec magic ends with ")"Andrew Wong2013-03-14
| * | | | | | | | | | | | | | | | | | | | | | setup.c: stop prefix_pathspec() from looping past the end of stringAndrew Wong2013-03-14
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/tag-force-no-warn-on-creation'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | tag: --force does not have to warn when creating tagsPhil Hord2013-03-13
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/unsigned-time-t'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Fix time offset calculation in case of unsigned time_tMike Gorchak2013-02-25
| * | | | | | | | | | | | | | | | | | | | | | | date.c: fix unsigned time_t comparisonMike Gorchak2013-02-25
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/suppress-clang-warning'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | fix clang -Wtautological-compare with unsigned enumAntoine Pelisse2013-02-25
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-symlinked-root'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4: avoid expanding client paths in chdirMiklós Fazekas2013-03-11
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: should honor symlink in p4 client rootPete Wyckoff2013-03-11
| * | | | | | | | | | | | | | | | | | | | | | | | | git p4 test: make sure P4CONFIG relative path worksPete Wyckoff2013-03-07
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/empty-archive'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | archive: handle commits with an empty treeJeff King2013-03-10
| * | | | | | | | | | | | | | | | | | | | | | | | | | test-lib: factor out $GIT_UNZIP setupJeff King2013-03-10
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/rfc2047-one-char-at-a-time'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: RFC 2047 says multi-octet character may not be splitKirill Smelkov2013-03-09
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/alias-in-bare'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | setup: suppress implicit "." work-tree for bare reposJeff King2013-03-08
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | environment: add GIT_PREFIX to local_repo_envJeff King2013-03-08
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | cache.h: drop LOCAL_REPO_ENV_SIZEJeff King2013-03-08
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-follow-tag'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | push: --follow-tagsJunio C Hamano2013-03-05
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit.c: use clear_commit_marks_many() in in_merge_bases_many()Junio C Hamano2013-03-05
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit.c: add in_merge_bases_many()Junio C Hamano2013-03-05
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit.c: add clear_commit_marks_many()Junio C Hamano2013-03-05
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog: fix typo in "reflog expire" clean-up codepathJunio C Hamano2013-03-05
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: make sure rename pretty print worksAntoine Pelisse2013-03-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: prevent pprint_rename from underrunning inputThomas Rast2013-02-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse2013-02-23
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-deinit'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: add 'deinit' commandJens Lehmann2013-03-04
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/describe'Junio C Hamano2013-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | describe: --match=<pattern> must limit the refs even when used with --allJunio C Hamano2013-02-28