aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10
| * | | | | | | | | | Documentation: format full commands in typewriter fontThomas Rast2010-01-10
| * | | | | | | | | | Documentation: warn prominently against merging with dirty treesThomas Rast2010-01-09
| * | | | | | | | | | Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast2010-01-09
* | | | | | | | | | | Merge branch 'jh/notes' (early part)Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add more testcases to test fast-import of notesJohan Herland2009-12-07
| * | | | | | | | | | | Rename t9301 to t9350, to make room for more fast-import testsJohan Herland2009-12-07
| * | | | | | | | | | | fast-import: Proper notes tree manipulationJohan Herland2009-12-07
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maintJunio C Hamano2010-01-20
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | status: don't require the repository to be writableJunio C Hamano2010-01-19
* | | | | | | | | | | | | Merge branch 'rr/core-tutorial'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation: Update git core tutorial clarifying reference to scriptsRamkumar Ramachandra2010-01-16
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | rerere forget path: forget recorded resolutionJunio C Hamano2010-01-10
| * | | | | | | | | | | | rerere: refactor rerere logic to make it independent from I/OJunio C Hamano2010-01-10
| * | | | | | | | | | | | rerere: remove silly 1024-byte line limitJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: allow plumbing to clear the informationJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: basic testsJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-25
| * | | | | | | | | | | | builtin-merge.c: use standard active_cache macrosJunio C Hamano2009-12-25
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'js/exec-error-report'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Improve error message when a transport helper was not foundIlari Liusvaara2010-01-12
| * | | | | | | | | | | | start_command: detect execvp failures earlyJohannes Sixt2010-01-10
| * | | | | | | | | | | | run-command: move wait_or_whine earlierJohannes Sixt2010-01-10
| * | | | | | | | | | | | start_command: report child process setup errors to the parent's stderrJohannes Sixt2010-01-10
* | | | | | | | | | | | | Merge branch 'jc/ls-files-ignored-pathspec'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ls-files: fix overeager pathspec optimizationJunio C Hamano2010-01-08
| * | | | | | | | | | | | | read_directory(): further split treat_path()Junio C Hamano2010-01-08
| * | | | | | | | | | | | | read_directory_recursive(): refactor handling of a single path into a separat...Junio C Hamano2010-01-08
| * | | | | | | | | | | | | t3001: test ls-files -o ignored/dirJunio C Hamano2010-01-08
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/grep-lookahead'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | grep --no-index: allow use of "git grep" outside a git repositoryJunio C Hamano2010-01-15
| * | | | | | | | | | | | | grep: prepare to run outside of a work treeJunio C Hamano2010-01-15
| * | | | | | | | | | | | | grep: rip out pessimization to use fixmatch()Junio C Hamano2010-01-13
| * | | | | | | | | | | | | grep: rip out support for external grepJunio C Hamano2010-01-13
| * | | | | | | | | | | | | Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc/maint-grep-lookaheadJunio C Hamano2010-01-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | grep: optimize built-in grep by skipping lines that do not hitJunio C Hamano2010-01-12
* | | | | | | | | | | | | | Merge branch 'jc/maint-strbuf-add-fix-doubling'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | strbuf_addbuf(): allow passing the same buf to dst and srcJunio C Hamano2010-01-13
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-12
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | difftool: Update copyright notices to list each year separatelyDavid Aguilar2010-01-15
| * | | | | | | | | | | | | | difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar2010-01-15
| * | | | | | | | | | | | | | difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-15
| * | | | | | | | | | | | | | t7800-difftool.sh: Simplify the --extcmd testDavid Aguilar2010-01-15
| * | | | | | | | | | | | | | git-diff.txt: Link to git-difftoolDavid Aguilar2010-01-09