summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.6.6-rc3v1.6.6-rc3Junio C Hamano2009-12-162-7/+1
* Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-1610-8/+91
|\
| * Git 1.6.5.7v1.6.5.7Junio C Hamano2009-12-164-3/+23
| * worktree: don't segfault with an absolute pathspec without a work treeJunio C Hamano2009-12-162-2/+20
| * ignore unknown color configurationJeff King2009-12-164-3/+26
| * help.autocorrect: do not run a command if the command given is junkJohannes Sixt2009-12-151-2/+5
| * Illustrate "filter" attribute with an exampleNanako Shiraishi2009-12-141-0/+19
* | bash: Support new 'git fetch' optionsBjörn Gustavsson2009-12-121-2/+12
* | Update Release Notes for 1.6.6 to remove old bugfixesJunio C Hamano2009-12-101-16/+0
* | Sync with 1.6.5.6Junio C Hamano2009-12-107-179/+37
|\ \ | |/
| * Git 1.6.5.6v1.6.5.6Junio C Hamano2009-12-104-3/+27
| * Fix archive format with -- on the command lineJunio C Hamano2009-12-101-6/+10
| * Remove post-upload-hookJunio C Hamano2009-12-104-172/+2
* | Git 1.6.6-rc2v1.6.6-rc2Junio C Hamano2009-12-092-4/+10
* | Merge git://repo.or.cz/git-guiJunio C Hamano2009-12-094-13/+37
|\ \
| * | git-gui: suppress RenderBadPicture X error caused by Tk bugJindrich Makovicka2009-12-071-0/+5
| * | git-gui: Increase blame viewer usability on MacOS.Alexander Gavrilov2009-12-051-1/+15
| * | git-gui: search 4 directories to improve statistic of gc hintClemens Buchacher2009-12-051-11/+10
| * | git gui: make current branch default in "remote delete branch" merge checkHeiko Voigt2009-12-051-1/+7
* | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2009-12-092-274/+1816
|\ \ \
| * | | gitk: Fix selection of tagsPat Thoyts2009-11-191-1/+1
| * | | gitk: Default to the system colours on WindowsPat Thoyts2009-11-141-5/+12
| * | | gitk: Merge branch 'dev' into masterPaul Mackerras2009-11-141-264/+497
| |\ \ \
| | * | | gitk: Don't compare fake children when comparing commitsPaul Mackerras2009-09-101-9/+21
| | * | | gitk: Show diff of commits at end of compare-commits outputPaul Mackerras2009-09-071-23/+58
| | * | | gitk: Add a user preference to enable/disable use of themed widgetsPaul Mackerras2009-09-051-10/+26
| | * | | Merge branch 'master' into devPaul Mackerras2009-09-053-591/+1062
| | |\ \ \
| | * | | | gitk: Fix errors in the theme patchPat Thoyts2009-05-161-2/+8
| | * | | | gitk: Use themed tk widgetsPat Thoyts2009-05-011-237/+370
| | * | | | Merge branch 'master' into devPaul Mackerras2009-05-013-104/+1650
| | |\ \ \ \
| | * | | | | gitk: Restore scrolling position of diff pane on back/forward in historyPaul Mackerras2008-11-231-9/+75
| * | | | | | gitk: Update Japanese translationMizar2009-11-141-260/+270
| * | | | | | gitk: Fix "git gui blame" invocation when called from top-level directoryMarkus Heidelberg2009-11-141-0/+3
| * | | | | | gitk: Disable checkout of remote branchesSitaram Chamarty2009-11-141-0/+3
| * | | | | | gitk: Improve appearance of radiobuttons and checkbuttonsPaul Mackerras2009-11-141-2/+12
| * | | | | | gitk: Skip translation of "wrong Tcl version" messageBernt Hansen2009-11-031-4/+4
| * | | | | | gitk: Add Japanese translationMizar2009-11-031-0/+1245
| * | | | | | gitk: Use the --submodule option for displaying diffs when availableJens Lehmann2009-11-031-1/+20
| * | | | | | gitk: Fix diffing committed -> staged (typo in diffcmd)Jens Lehmann2009-11-031-1/+1
| * | | | | | gitk: Add configuration for UI colour schemeGuillermo S. Romero2009-11-031-2/+14
* | | | | | | Update draft release notes to 1.6.6 before -rc2Junio C Hamano2009-12-091-21/+18
* | | | | | | Merge branch 'maint'Junio C Hamano2009-12-083-16/+58
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'mm/maint-merge-ff-error-message-fix' into maintJunio C Hamano2009-12-083-18/+27
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/maint-pull-rebase-error-message' into maintJunio C Hamano2009-12-081-15/+33
| |\ \ \ \ \ \ \
| | * | | | | | | pull: clarify advice for the unconfigured error caseJan Krüger2009-12-031-15/+33
| * | | | | | | | Merge branch 'jk/maint-add-p-delete-fix' into maintJunio C Hamano2009-12-082-1/+25
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add-interactive: fix deletion of non-empty filesJeff King2009-12-072-1/+25
* | | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-12-081-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-svn: set svn.authorsfile earlier when cloningAlex Vandiver2009-12-081-1/+1
| * | | | | | | | | | git-svn: Set svn.authorsfile to an absolute path when cloningAlex Vandiver2009-12-081-1/+3