Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'mm/config-pathname-tilde-expand' | Junio C Hamano | 2009-11-22 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | Expand ~ and ~user in core.excludesfile, commit.template | Matthieu Moy | 2009-11-17 |
| | |_|/ / | |/| | | | |||
* | | | | | Merge branch 'tc/format-attribute' | Junio C Hamano | 2009-11-22 |
|\ \ \ \ \ | |||
| * | | | | | Check the format of more printf-type functions | Tarmigan Casebolt | 2009-11-15 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'jh/notes' (early part) | Junio C Hamano | 2009-11-20 |
|\ \ \ \ \ | |||
| * | | | | | Introduce commit notes | Johannes Schindelin | 2009-10-19 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'sp/smart-http' | Junio C Hamano | 2009-11-20 |
|\ \ \ \ \ | |||
| * | | | | | http-backend: Protect GIT_PROJECT_ROOT from /../ requests | Shawn O. Pearce | 2009-11-09 |
| * | | | | | Move "get_ack()" back to fetch-pack | Shawn O. Pearce | 2009-10-30 |
| |/ / / / | |||
* | | | | | Merge branch 'jn/editor-pager' | Junio C Hamano | 2009-11-20 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||
| * | | | | Teach git var about GIT_PAGER | Jonathan Nieder | 2009-11-13 |
| * | | | | Teach git var about GIT_EDITOR | Jonathan Nieder | 2009-11-13 |
* | | | | | check_filename(): make verify_filename() callable without dying | Junio C Hamano | 2009-10-18 |
|/ / / / | |||
* | | | | Merge branch 'jc/maint-blank-at-eof' | Junio C Hamano | 2009-10-17 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||
| * | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 |
| |\ \ | | |/ | |/| |