Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 2 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 2 | -39/+50 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -38/+49 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | fetch: create status table using strbufjk/maint-fetch-status-table | Jeff King | 2011-12-09 | 1 | -38/+49 | |
| | | * | | | | | | | | | | | | | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | blame: don't overflow time buffer | Jeff King | 2011-12-13 | 1 | -1/+1 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-09 | 11 | -43/+72 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Copy resolve_ref() return value for longer use | Nguyễn Thái Ngọc Duy | 2011-12-05 | 7 | -27/+62 | |
| * | | | | | | | | | | | | | | | | | Convert many resolve_ref() calls to read_ref*() and ref_exists() | Nguyễn Thái Ngọc Duy | 2011-11-13 | 7 | -17/+14 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2011-12-09 | 7 | -195/+221 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | commit-tree: teach -m/-F options to read logs from elsewhere | Junio C Hamano | 2011-11-12 | 1 | -3/+40 | |
| * | | | | | | | | | | | | | | | | | | commit-tree: update the command line parsing | Junio C Hamano | 2011-11-09 | 1 | -13/+18 | |
| * | | | | | | | | | | | | | | | | | | commit: teach --amend to carry forward extra headers | Junio C Hamano | 2011-11-09 | 1 | -2/+7 | |
| * | | | | | | | | | | | | | | | | | | merge: force edit and no-ff mode when merging a tag object | Junio C Hamano | 2011-11-09 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | | | | commit: copy merged signed tags to headers of merge commit | Junio C Hamano | 2011-11-09 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | merge: record tag objects without peeling in MERGE_HEAD | Junio C Hamano | 2011-11-08 | 1 | -3/+10 | |
| * | | | | | | | | | | | | | | | | | | merge: make usage of commit->util more extensible | Junio C Hamano | 2011-11-08 | 1 | -40/+23 | |
| * | | | | | | | | | | | | | | | | | | fmt-merge-msg: Add contents of merged tag in the merge message | Junio C Hamano | 2011-11-08 | 1 | -2/+70 | |
| * | | | | | | | | | | | | | | | | | | fmt-merge-msg: package options into a structure | Junio C Hamano | 2011-11-07 | 2 | -17/+20 | |
| * | | | | | | | | | | | | | | | | | | fmt-merge-msg: avoid early returns | Junio C Hamano | 2011-11-07 | 1 | -10/+10 | |
| * | | | | | | | | | | | | | | | | | | merge: notice local merging of tags and keep it unwrapped | Junio C Hamano | 2011-11-07 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | fetch: do not store peeled tag object names in FETCH_HEAD | Linus Torvalds | 2011-11-04 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | | | Split GPG interface into its own helper library | Junio C Hamano | 2011-11-04 | 2 | -100/+11 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/request-pull-show-head-4' | Junio C Hamano | 2011-12-09 | 4 | -32/+192 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error | Ramsay Jones | 2011-10-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | builtin/log.c: Fix an "Using plain integer as NULL pointer" warning | Ramsay Jones | 2011-10-09 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | fmt-merge-msg: use branch.$name.description | Junio C Hamano | 2011-10-07 | 2 | -26/+69 | |
| * | | | | | | | | | | | | | | | | | | branch: teach --edit-description option | Junio C Hamano | 2011-10-05 | 1 | -2/+54 | |
| * | | | | | | | | | | | | | | | | | | format-patch: use branch description in cover letter | Junio C Hamano | 2011-10-05 | 1 | -3/+68 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/maint-ignore-exclude' | Junio C Hamano | 2011-12-05 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-exclude | Nguyễn Thái Ngọc Duy | 2011-11-28 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'vr/git-merge-default-to-upstream' | Junio C Hamano | 2011-12-05 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Show error for 'git merge' with unset merge.defaultToUpstreamvr/git-merge-default-to-upstream | Vincent van Ravesteijn | 2011-11-21 | 1 | -3/+6 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle' | Junio C Hamano | 2011-12-05 | 1 | -12/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | pack-object: tolerate broken packs that have duplicated objectsjc/maint-pack-object-cycle | Junio C Hamano | 2011-11-16 | 1 | -12/+43 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/index-pack-reject-dups' | Junio C Hamano | 2011-12-05 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | receive-pack, fetch-pack: reject bogus pack that records objects twicejc/index-pack-reject-dups | Junio C Hamano | 2011-11-16 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ab/clang-lints' | Junio C Hamano | 2011-12-05 | 2 | -4/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lints | Ævar Arnfjörð Bjarmason | 2011-11-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | apply: get rid of useless x < 0 comparison on a size_t type | Ævar Arnfjörð Bjarmason | 2011-11-06 | 1 | -3/+0 | |
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/prune-progress' | Junio C Hamano | 2011-12-05 | 3 | -3/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | prune: handle --progress/no-progress | Jeff King | 2011-11-07 | 2 | -3/+12 | |
| * | | | | | | | | | | | | | | | | | | prune: show progress while marking reachable objects | Nguyễn Thái Ngọc Duy | 2011-11-07 | 2 | -2/+6 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/fsck-progress' | Junio C Hamano | 2011-12-05 | 1 | -16/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | fsck: print progressnd/fsck-progress | Nguyễn Thái Ngọc Duy | 2011-11-06 | 1 | -2/+38 | |
| * | | | | | | | | | | | | | | | | | | fsck: avoid reading every object twice | Nguyễn Thái Ngọc Duy | 2011-11-06 | 1 | -17/+25 | |
| * | | | | | | | | | | | | | | | | | | fsck: return error code when verify_pack() goes wrong | Nguyễn Thái Ngọc Duy | 2011-11-06 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/misc-cleanups' | Junio C Hamano | 2011-12-05 | 2 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | tree_entry_interesting(): give meaningful names to return values | Nguyễn Thái Ngọc Duy | 2011-10-27 | 1 | -4/+5 | |
| * | | | | | | | | | | | | | | | | | tree-walk.c: do not leak internal structure in tree_entry_len() | Nguyễn Thái Ngọc Duy | 2011-10-27 | 2 | -2/+2 |