Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | |
| * | | | | | | | | | | Documentation: format full commands in typewriter font | Thomas Rast | 2010-01-10 | |
| * | | | | | | | | | | Documentation: warn prominently against merging with dirty trees | Thomas Rast | 2010-01-09 | |
| * | | | | | | | | | | Documentation/git-merge: reword references to "remote" and "pull" | Thomas Rast | 2010-01-09 | |
* | | | | | | | | | | | Merge branch 'jh/notes' (early part) | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | Add more testcases to test fast-import of notes | Johan Herland | 2009-12-07 | |
| * | | | | | | | | | | | Rename t9301 to t9350, to make room for more fast-import tests | Johan Herland | 2009-12-07 | |
| * | | | | | | | | | | | fast-import: Proper notes tree manipulation | Johan Herland | 2009-12-07 | |
* | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maint | Junio C Hamano | 2010-01-20 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | status: don't require the repository to be writable | Junio C Hamano | 2010-01-19 | |
* | | | | | | | | | | | | | Merge branch 'rr/core-tutorial' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | Documentation: Update git core tutorial clarifying reference to scripts | Ramkumar Ramachandra | 2010-01-16 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'jc/cache-unmerge' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | rerere forget path: forget recorded resolution | Junio C Hamano | 2010-01-10 | |
| * | | | | | | | | | | | | rerere: refactor rerere logic to make it independent from I/O | Junio C Hamano | 2010-01-10 | |
| * | | | | | | | | | | | | rerere: remove silly 1024-byte line limit | Junio C Hamano | 2009-12-25 | |
| * | | | | | | | | | | | | 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: allow plumbing to clear the information | Junio C Hamano | 2009-12-25 | |
| * | | | | | | | | | | | | resolve-undo: basic tests | Junio C Hamano | 2009-12-25 | |
| * | | | | | | | | | | | | resolve-undo: record resolved conflicts in a new index extension section | Junio C Hamano | 2009-12-25 | |
| * | | | | | | | | | | | | builtin-merge.c: use standard active_cache macros | Junio C Hamano | 2009-12-25 | |
| |/ / / / / / / / / / / | ||||
* | | | | | | | | | | | | Merge branch 'js/exec-error-report' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | Improve error message when a transport helper was not found | Ilari Liusvaara | 2010-01-12 | |
| * | | | | | | | | | | | | start_command: detect execvp failures early | Johannes Sixt | 2010-01-10 | |
| * | | | | | | | | | | | | run-command: move wait_or_whine earlier | Johannes Sixt | 2010-01-10 | |
| * | | | | | | | | | | | | start_command: report child process setup errors to the parent's stderr | Johannes Sixt | 2010-01-10 | |
* | | | | | | | | | | | | | Merge branch 'jc/ls-files-ignored-pathspec' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | ls-files: fix overeager pathspec optimization | Junio C Hamano | 2010-01-08 | |
| * | | | | | | | | | | | | | read_directory(): further split treat_path() | Junio C Hamano | 2010-01-08 | |
| * | | | | | | | | | | | | | read_directory_recursive(): refactor handling of a single path into a separat... | Junio C Hamano | 2010-01-08 | |
| * | | | | | | | | | | | | | t3001: test ls-files -o ignored/dir | Junio C Hamano | 2010-01-08 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'jc/grep-lookahead' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | grep --no-index: allow use of "git grep" outside a git repository | Junio C Hamano | 2010-01-15 | |
| * | | | | | | | | | | | | | grep: prepare to run outside of a work tree | Junio C Hamano | 2010-01-15 | |
| * | | | | | | | | | | | | | grep: rip out pessimization to use fixmatch() | Junio C Hamano | 2010-01-13 | |
| * | | | | | | | | | | | | | grep: rip out support for external grep | Junio C Hamano | 2010-01-13 | |
| * | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc/maint-grep-lookahead | Junio C Hamano | 2010-01-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | grep: optimize built-in grep by skipping lines that do not hit | Junio C Hamano | 2010-01-12 | |
* | | | | | | | | | | | | | | Merge branch 'jc/maint-strbuf-add-fix-doubling' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | strbuf_addbuf(): allow passing the same buf to dst and src | Junio C Hamano | 2010-01-13 | |
| |/ / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | Merge branch 'mm/conflict-advice' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 2010-01-12 | |
| |/ / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2010-01-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | difftool: Update copyright notices to list each year separately | David Aguilar | 2010-01-15 | |
| * | | | | | | | | | | | | | | difftool: Use eval to expand '--extcmd' expressions | David Aguilar | 2010-01-15 | |
| * | | | | | | | | | | | | | | difftool: Add '-x' and as an alias for '--extcmd' | David Aguilar | 2010-01-15 | |
| * | | | | | | | | | | | | | | t7800-difftool.sh: Simplify the --extcmd test | David Aguilar | 2010-01-15 | |
| * | | | | | | | | | | | | | | git-diff.txt: Link to git-difftool | David Aguilar | 2010-01-09 |