Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 |
|\ | |||
| * | builtin/merge: make checkout_fast_forward() non static | Junio C Hamano | 2010-03-06 |
* | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 |
|\ \ | |||
| * | | notes: implement helpers needed for note copying during rewrite | Thomas Rast | 2010-03-12 |
| * | | Support showing notes from more than one notes tree | Thomas Rast | 2010-03-12 |
* | | | Merge branch 'fl/askpass' | Junio C Hamano | 2010-03-20 |
|\ \ \ | |||
| * | | | git-core: Support retrieving passwords with GIT_ASKPASS | Frank Li | 2010-03-04 |
* | | | | Merge branch 'gb/maint-submodule-env' | Junio C Hamano | 2010-03-07 |
|\ \ \ \ | |||
| * | | | | Refactor list of of repo-local env vars | Giuseppe Bilotta | 2010-02-24 |
| |/ / / | |||
* | | | | Merge branch 'nd/root-git' | Junio C Hamano | 2010-03-07 |
|\ \ \ \ | |||
| * | | | | Move offset_1st_component() to path.c | Nguyễn Thái Ngọc Duy | 2010-02-16 |
| * | | | | Merge branch 'jc/maint-reflog-bad-timestamp' into maint | Junio C Hamano | 2010-02-10 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'mm/mkstemps-mode-for-packfiles' | Junio C Hamano | 2010-03-07 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||
| * | | | | | git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument. | Matthieu Moy | 2010-02-22 |
| | |_|/ / | |/| | | | |||
* | | | | | Make 'git var GIT_PAGER' always print the configured pager | Jonathan Nieder | 2010-02-14 |
|/ / / / | |||
* | | | | Merge branch 'jc/maint-reflog-bad-timestamp' | Junio C Hamano | 2010-01-27 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | approxidate_careful() reports errorneous date string | Junio C Hamano | 2010-01-26 |
| * | | | Merge branch 'mm/config-pathname-tilde-expand' into maint | Junio C Hamano | 2009-12-03 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'jc/maint-blank-at-eof' into maint | Junio C Hamano | 2009-11-15 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'jc/fix-tree-walk' | Junio C Hamano | 2010-01-24 |
|\ \ \ \ \ \ | |||
| * | | | | | | unpack-trees.c: prepare for looking ahead in the index | Junio C Hamano | 2010-01-07 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'il/branch-set-upstream' | Junio C Hamano | 2010-01-22 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||
| * | | | | | Add branch --set-upstream | Ilari Liusvaara | 2010-01-18 |
* | | | | | | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ | |||
| * | | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'jc/cache-unmerge' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ | |||
| * | | | | | | resolve-undo: teach "update-index --unresolve" to use resolve-undo info | Junio C Hamano | 2009-12-25 |
| * | | | | | | resolve-undo: "checkout -m path" uses resolve-undo information | Junio C Hamano | 2009-12-25 |
| * | | | | | | resolve-undo: record resolved conflicts in a new index extension section | Junio C Hamano | 2009-12-25 |
| |/ / / / / | |||
* | | | | | | Merge branch 'jc/ident' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ | |||
| * | | | | | | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere | Junio C Hamano | 2010-01-17 |
| * | | | | | | ident.c: check explicit identity for name and email separately | Junio C Hamano | 2010-01-10 |
| |/ / / / / | |||
* | | | | | | Merge branch 'jc/symbol-static' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | symlinks.c: remove unused functions | Junio C Hamano | 2010-01-17 |
| * | | | | | sha1_file.c: remove unused function | Junio C Hamano | 2010-01-12 |
| * | | | | | read-cache.c: mark file-local functions static | Junio C Hamano | 2010-01-12 |
| * | | | | | entry.c: mark file-local function static | Junio C Hamano | 2010-01-12 |
* | | | | | | Merge branch 'jc/checkout-merge-base' | Junio C Hamano | 2010-01-13 |
|\ \ \ \ \ \ | |||
| * | | | | | | "checkout A...B" switches to the merge base between A and B | Junio C Hamano | 2009-10-18 |
* | | | | | | | Merge branch 'cc/reset-more' | Junio C Hamano | 2010-01-13 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Fix bit assignment for CE_CONFLICTED | Junio C Hamano | 2010-01-04 |
| * | | | | | | | "reset --merge": fix unmerged case | Junio C Hamano | 2010-01-03 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'nd/sparse' | Junio C Hamano | 2010-01-13 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||
| * | | | | | | ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID | Nguyễn Thái Ngọc Duy | 2009-12-14 |
| * | | | | | | unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout | Nguyễn Thái Ngọc Duy | 2009-08-23 |
| * | | | | | | unpack-trees(): add CE_WT_REMOVE to remove on worktree alone | Nguyễn Thái Ngọc Duy | 2009-08-23 |
| * | | | | | | Introduce "skip-worktree" bit in index, teach Git to get/set this bit | Nguyễn Thái Ngọc Duy | 2009-08-23 |
* | | | | | | | Detailed diagnosis when parsing an object name fails. | Matthieu Moy | 2009-12-07 |
| |/ / / / / |/| | | | | | |||
* | | | | | | Merge branch 'cc/replace' | Junio C Hamano | 2009-11-23 |
|\ \ \ \ \ \ | |||
| * | | | | | | replace: use a GIT_NO_REPLACE_OBJECTS env variable | Christian Couder | 2009-11-20 |
| | |/ / / / | |/| | | | |