Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/fast-export-object-lookup' | Junio C Hamano | 2013-03-25 | 1 | -9/+13 |
|\ | |||||
| * | fast-export: do not load blob objects twice | Jeff King | 2013-03-17 | 1 | -6/+10 |
| * | fast-export: rename handle_object function | Jeff King | 2013-03-17 | 1 | -3/+3 |
* | | Merge branch 'jk/peel-ref' | Junio C Hamano | 2013-03-25 | 2 | -4/+11 |
|\ \ | |||||
| * | | upload-pack: load non-tip "want" objects from disk | Jeff King | 2013-03-16 | 1 | -2/+2 |
| * | | upload-pack: make sure "want" objects are parsed | Jeff King | 2013-03-16 | 2 | -1/+10 |
| * | | upload-pack: drop lookup-before-parse optimization | Jeff King | 2013-03-16 | 1 | -3/+1 |
* | | | Merge branch 'lf/setup-prefix-pathspec' | Junio C Hamano | 2013-03-25 | 1 | -5/+7 |
|\ \ \ | |||||
| * | | | setup.c: check that the pathspec magic ends with ")" | Andrew Wong | 2013-03-14 | 1 | -2/+3 |
| * | | | setup.c: stop prefix_pathspec() from looping past the end of string | Andrew Wong | 2013-03-14 | 1 | -3/+4 |
* | | | | Merge branch 'ph/tag-force-no-warn-on-creation' | Junio C Hamano | 2013-03-25 | 2 | -1/+13 |
|\ \ \ \ | |||||
| * | | | | tag: --force does not have to warn when creating tags | Phil Hord | 2013-03-13 | 2 | -1/+13 |
* | | | | | Merge branch 'mg/unsigned-time-t' | Junio C Hamano | 2013-03-25 | 1 | -3/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Fix time offset calculation in case of unsigned time_t | Mike Gorchak | 2013-02-25 | 1 | -2/+8 |
| * | | | | | date.c: fix unsigned time_t comparison | Mike Gorchak | 2013-02-25 | 1 | -1/+1 |
* | | | | | | Merge branch 'jk/suppress-clang-warning' | Junio C Hamano | 2013-03-25 | 2 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix clang -Wtautological-compare with unsigned enum | Antoine Pelisse | 2013-02-25 | 2 | -2/+4 |
* | | | | | | | Merge branch 'pw/p4-symlinked-root' | Junio C Hamano | 2013-03-25 | 2 | -7/+63 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git p4: avoid expanding client paths in chdir | Miklós Fazekas | 2013-03-11 | 2 | -8/+23 |
| * | | | | | | | git p4 test: should honor symlink in p4 client root | Pete Wyckoff | 2013-03-11 | 1 | -0/+27 |
| * | | | | | | | git p4 test: make sure P4CONFIG relative path works | Pete Wyckoff | 2013-03-07 | 1 | -0/+14 |
* | | | | | | | | Merge branch 'jk/empty-archive' | Junio C Hamano | 2013-03-25 | 6 | -13/+109 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | archive: handle commits with an empty tree | Jeff King | 2013-03-10 | 3 | -1/+103 |
| * | | | | | | | | test-lib: factor out $GIT_UNZIP setup | Jeff King | 2013-03-10 | 3 | -12/+6 |
* | | | | | | | | | Merge branch 'ks/rfc2047-one-char-at-a-time' | Junio C Hamano | 2013-03-25 | 4 | -25/+77 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | format-patch: RFC 2047 says multi-octet character may not be split | Kirill Smelkov | 2013-03-09 | 4 | -25/+77 |
* | | | | | | | | | | Merge branch 'jk/alias-in-bare' | Junio C Hamano | 2013-03-25 | 5 | -12/+53 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | setup: suppress implicit "." work-tree for bare repos | Jeff King | 2013-03-08 | 5 | -0/+41 |
| * | | | | | | | | | | environment: add GIT_PREFIX to local_repo_env | Jeff King | 2013-03-08 | 3 | -2/+4 |
| * | | | | | | | | | | cache.h: drop LOCAL_REPO_ENV_SIZE | Jeff King | 2013-03-08 | 2 | -10/+8 |
* | | | | | | | | | | | Merge branch 'jc/push-follow-tag' | Junio C Hamano | 2013-03-25 | 9 | -14/+218 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | push: --follow-tags | Junio C Hamano | 2013-03-05 | 7 | -2/+186 |
| * | | | | | | | | | | | commit.c: use clear_commit_marks_many() in in_merge_bases_many() | Junio C Hamano | 2013-03-05 | 1 | -2/+1 |
| * | | | | | | | | | | | commit.c: add in_merge_bases_many() | Junio C Hamano | 2013-03-05 | 2 | -6/+19 |
| * | | | | | | | | | | | commit.c: add clear_commit_marks_many() | Junio C Hamano | 2013-03-05 | 2 | -6/+14 |
* | | | | | | | | | | | | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' | Junio C Hamano | 2013-03-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | reflog: fix typo in "reflog expire" clean-up codepath | Junio C Hamano | 2013-03-05 | 1 | -1/+1 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' | Junio C Hamano | 2013-03-25 | 2 | -1/+67 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | tests: make sure rename pretty print works | Antoine Pelisse | 2013-03-06 | 1 | -0/+54 |
| * | | | | | | | | | | | | diff: prevent pprint_rename from underrunning input | Thomas Rast | 2013-02-26 | 1 | -7/+10 |
| * | | | | | | | | | | | | diff: Fix rename pretty-print when suffix and prefix overlap | Antoine Pelisse | 2013-02-23 | 1 | -1/+10 |
* | | | | | | | | | | | | | Merge branch 'jl/submodule-deinit' | Junio C Hamano | 2013-03-25 | 5 | -3/+198 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | submodule: add 'deinit' command | Jens Lehmann | 2013-03-04 | 5 | -3/+198 |
* | | | | | | | | | | | | | | Merge branch 'jc/describe' | Junio C Hamano | 2013-03-25 | 1 | -21/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | describe: --match=<pattern> must limit the refs even when used with --all | Junio C Hamano | 2013-02-28 | 1 | -21/+20 |
* | | | | | | | | | | | | | | | Merge branch 'pe/pull-rebase-v-q' | Junio C Hamano | 2013-03-25 | 2 | -1/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | pull: Apply -q and -v options to rebase mode as well | Peter Eisentraut | 2013-03-16 | 2 | -1/+28 |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-25 | 2 | -1/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Start preparing for 1.8.2.1 | Junio C Hamano | 2013-03-25 | 2 | -1/+30 |
| * | | | | | | | | | | | | | | | Merge branch 'jk/graph-c-expose-symbols-for-cgit' into maint | Junio C Hamano | 2013-03-25 | 2 | -30/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |