summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano2009-12-082-9/+3
|/ / / / / / / / /
* | | | | | | | | git svn: log removals of empty directoriesEric Wong2009-12-072-1/+11
* | | | | | | | | git svn: Don't create empty directories whose parents were deletedGreg Price2009-12-071-1/+2
* | | | | | | | | git-svn: sort svk merge tickets to account for minimal parentsAlex Vandiver2009-12-071-1/+5
* | | | | | | | | bash: update 'git commit' completionSZEDER Gábor2009-12-051-1/+21
* | | | | | | | | Sync with 1.6.5.5Junio C Hamano2009-12-0510-22/+80
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Git 1.6.5.5v1.6.5.5Junio C Hamano2009-12-054-5/+11
| * | | | | | | | Fix diff -B/--dirstat miscounting of newly added contentsLinus Torvalds2009-12-051-1/+10
| * | | | | | | | reset: improve worktree safety valvesJeff King2009-12-052-5/+33
| * | | | | | | | Documentation: Avoid use of xmlto --stringparamTodd Zullinger2009-12-053-11/+23
| * | | | | | | | archive: clarify description of path parameterRené Scharfe2009-12-041-2/+3
| * | | | | | | | rerere: don't segfault on failure to open rr-cacheJeff King2009-12-041-0/+2
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-033-2/+53
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Prepare for 1.6.5.5Junio C Hamano2009-12-031-0/+44
| * | | | | | | | Merge branch 'uk/maint-shortlog-encoding' into maintJunio C Hamano2009-12-032-9/+39
| |\ \ \ \ \ \ \ \
| | * | | | | | | | t4201: use ISO8859-1 rather than ISO-8859-1Brandon Casey2009-12-031-2/+2
| * | | | | | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maintJunio C Hamano2009-12-032-1/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-merge-strategy-list-fix' into maintJunio C Hamano2009-12-031-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-am-keep' into maintJunio C Hamano2009-12-031-5/+6
| |\ \ \ \ \ \ \ \ \ \ \