aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
* git_attr(): fix function signatureJunio C Hamano2010-01-16
* 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
* Git 1.6.6v1.6.6Junio C Hamano2009-12-23
* git svn: add test for a git svn gc followed by a git svn mkdirsRobert Zeh2009-12-23
* git svn: branch/tag commands detect username in URLsEric Wong2009-12-23
* Merge branch 'maint'Junio C Hamano2009-12-22
|\
| * Prevent git blame from segfaulting on a missing author nameDavid Reiss2009-12-22
* | git svn: lookup new parents correctly from svn:mergeinfoEric Wong2009-12-22
* | git-svn: Remove obsolete MAXPARENT checkAndrew Myrick2009-12-21
* | git-svn: detect cherry-picks correctly.Sam Vilain2009-12-21
* | git-svn: exclude already merged tips using one rev-list callSam Vilain2009-12-21
* | git-svn: fix some mistakes with interpreting SVN mergeinfo commit rangesSam Vilain2009-12-21
* | git-svn: memoize conversion of SVN merge ticket info to git commit rangesSam Vilain2009-12-21
* | git-svn: expand the svn mergeinfo test suite, highlighting some failuresSam Vilain2009-12-21
* | update release notes for git svn in 1.6.6Eric Wong2009-12-21
* | git svn: fix --revision when fetching deleted pathsEric Wong2009-12-21
* | Git 1.6.6-rc4v1.6.6-rc4Junio C Hamano2009-12-20
* | Merge branch 'maint'Junio C Hamano2009-12-19
|\ \ | |/
| * rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson2009-12-19
| * technical-docs: document hash APIStephen Boyd2009-12-17
| * api-strbuf.txt: fix typos and document launch_editor()Stephen Boyd2009-12-17
* | t9146: use 'svn_cmd' wrapperEric Wong2009-12-19
* | git svn: make empty directory creation gc-awareEric Wong2009-12-19
* | Git 1.6.6-rc3v1.6.6-rc3Junio C Hamano2009-12-16
* | Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-16
|\ \ | |/
| * Git 1.6.5.7v1.6.5.7Junio C Hamano2009-12-16
| * worktree: don't segfault with an absolute pathspec without a work treeJunio C Hamano2009-12-16
| * ignore unknown color configurationJeff King2009-12-16
| * help.autocorrect: do not run a command if the command given is junkJohannes Sixt2009-12-15
| * Illustrate "filter" attribute with an exampleNanako Shiraishi2009-12-14
* | bash: Support new 'git fetch' optionsBjörn Gustavsson2009-12-12
* | Update Release Notes for 1.6.6 to remove old bugfixesJunio C Hamano2009-12-10
* | Sync with 1.6.5.6Junio C Hamano2009-12-10
|\ \ | |/
| * Git 1.6.5.6v1.6.5.6Junio C Hamano2009-12-10
| * Fix archive format with -- on the command lineJunio C Hamano2009-12-10
| * Remove post-upload-hookJunio C Hamano2009-12-10
* | Git 1.6.6-rc2v1.6.6-rc2Junio C Hamano2009-12-09
* | Merge git://repo.or.cz/git-guiJunio C Hamano2009-12-09
|\ \
| * | git-gui: suppress RenderBadPicture X error caused by Tk bugJindrich Makovicka2009-12-07
| * | git-gui: Increase blame viewer usability on MacOS.Alexander Gavrilov2009-12-05
| * | git-gui: search 4 directories to improve statistic of gc hintClemens Buchacher2009-12-05