summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce
2008-09-29Add contrib/rerere-train scriptNanako Shiraishi
2008-09-29mingw: remove use of _getdrive() from lstat/fstatDmitry Potapov
2008-09-29compat/mingw: Support a timeout in the poll emulation if no fds are givenJohannes Sixt
2008-09-29usage.c: remove unused functionsNanako Shiraishi
2008-09-26Merge branch 'maint'Shawn O. Pearce
2008-09-26Cleanup remove_pathAlex Riesen
2008-09-26Remove empty directories in recursive mergeAlex Riesen
2008-09-26Documentation: clarify the details of overriding LESS via core.pagerChris Frey
2008-09-25Merge branch 'mv/merge-recursive'Shawn O. Pearce
2008-09-25Merge branch 'jc/alternate-push'Shawn O. Pearce
2008-09-25Merge branch 'am/status'Shawn O. Pearce
2008-09-25Merge branch 'pb/autocorrect-wrapper'Shawn O. Pearce
2008-09-25Merge branch 'mv/commit-tree'Shawn O. Pearce
2008-09-25Merge branch 'jc/apply-include-exclude'Shawn O. Pearce
2008-09-25Merge branch 'jc/safe-c-l-d'Shawn O. Pearce
2008-09-25gitweb: shortlog now also obeys $hash_parentGiuseppe Bilotta
2008-09-25Merge branch 'ho/dirstat-by-file'Shawn O. Pearce
2008-09-25Merge git://repo.or.cz/git-guiShawn O. Pearce
2008-09-25Merge branch 'maint'Shawn O. Pearce
2008-09-25Update release notes for 1.6.0.3Shawn O. Pearce
2008-09-25Fix submodule sync with relative submodule URLsJohan Herland
2008-09-25graph.c: make many functions staticNanako Shiraishi
2008-09-25remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static.Nanako Shiraishi
2008-09-25checkout: Do not show local changes when in quiet modeJonas Fonseca
2008-09-25for-each-ref: Fix --format=%(subject) for log message without newlinesJohan Herland
2008-09-24git-web--browse: Support for using /bin/start on MinGWPetr Baudis
2008-09-24git-gui: Reenable staging unmerged files by clicking the icon.Alexander Gavrilov
2008-09-24git-gui: Support the encoding menu in gui blame.Alexander Gavrilov
2008-09-24git-gui: Optimize encoding name resolution using a lookup table.Alexander Gavrilov
2008-09-24git-gui: Allow forcing display encoding for diffs using a submenu.Alexander Gavrilov
2008-09-24git-gui: Add a menu of available encodings.Alexander Gavrilov
2008-09-24git-gui: Cleanup handling of the default encoding.Alexander Gavrilov
2008-09-24git-gui: Assume `blame --incremental` output is in UTF-8Shawn O. Pearce
2008-09-24git-gui: Use gitattribute "encoding" for file content displayShawn O. Pearce
2008-09-24git-gui: Add support for calling out to the prepare-commit-msg hookJoshua Williams
2008-09-24git-gui: Hide commit related UI during citool --nocommitShawn O. Pearce
2008-09-24git-gui: Add more integration options to citool.Alexander Gavrilov
2008-09-24git-stash.sh: don't default to refs/stash if invalid ref suppliedBrandon Casey
2008-09-24Fixed some grammatical errors in git-rebase.txt documentation.Garry Dolley
2008-09-24maint: check return of split_cmdline to avoid bad config stringsDeskin Miller
2008-09-23Merge branch 'maint'Junio C Hamano
2008-09-23builtin-prune.c: prune temporary packs in <object_dir>/pack directoryBrandon Casey
2008-09-22Do not perform cross-directory renames when creating packsPetr Baudis
2008-09-22Merge branch 'maint'Junio C Hamano
2008-09-22Use dashless git commands in setgitperms.perlTodd Zullinger
2008-09-22git-remote: do not use user input in a printf format stringJohannes Sixt
2008-09-22git-svn: do a partial rebuild if rev_map is out-of-dateDeskin Miller
2008-09-22git-svn: testcase for partial rebuildDeskin Miler
2008-09-22Merge branch 'db/maint-checkout-b'Junio C Hamano