summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge git://repo.or.cz/git-guiShawn O. Pearce2008-09-259-141/+793
|\
| * git-gui: Reenable staging unmerged files by clicking the icon.Alexander Gavrilov2008-09-243-33/+70
| * git-gui: Support the encoding menu in gui blame.Alexander Gavrilov2008-09-241-0/+17
| * git-gui: Optimize encoding name resolution using a lookup table.Alexander Gavrilov2008-09-241-29/+53
| * git-gui: Allow forcing display encoding for diffs using a submenu.Alexander Gavrilov2008-09-243-2/+44
| * git-gui: Add a menu of available encodings.Alexander Gavrilov2008-09-242-4/+142
| * git-gui: Cleanup handling of the default encoding.Alexander Gavrilov2008-09-245-6/+46
| * git-gui: Assume `blame --incremental` output is in UTF-8Shawn O. Pearce2008-09-241-7/+1
| * git-gui: Use gitattribute "encoding" for file content displayShawn O. Pearce2008-09-244-4/+26
| * git-gui: Add support for calling out to the prepare-commit-msg hookJoshua Williams2008-09-241-0/+65
| * git-gui: Hide commit related UI during citool --nocommitShawn O. Pearce2008-09-241-48/+56
| * git-gui: Add more integration options to citool.Alexander Gavrilov2008-09-242-6/+83
| * git-gui: Updated German translation.Christian Stimming2008-09-131-21/+172
| * git-gui: I18n fix sentence parts into full sentences for translation again.Christian Stimming2008-09-121-6/+6
| * git-gui: Restore ability to Stage Working Copy for conflicts.Alexander Gavrilov2008-09-122-0/+11
| * git-gui: Fix Blame Parent & Context for working copy lines.Alexander Gavrilov2008-09-122-3/+29
* | Merge branch 'maint'Shawn O. Pearce2008-09-257-6/+49
|\ \
| * | Update release notes for 1.6.0.3Shawn O. Pearce2008-09-251-1/+17
| * | checkout: Do not show local changes when in quiet modeJonas Fonseca2008-09-251-1/+1
| * | for-each-ref: Fix --format=%(subject) for log message without newlinesJohan Herland2008-09-241-2/+2
| * | git-stash.sh: don't default to refs/stash if invalid ref suppliedBrandon Casey2008-09-241-2/+15
| * | maint: check return of split_cmdline to avoid bad config stringsDeskin Miller2008-09-243-0/+14
* | | Fix submodule sync with relative submodule URLsJohan Herland2008-09-251-0/+8
* | | graph.c: make many functions staticNanako Shiraishi2008-09-252-54/+43
* | | remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static.Nanako Shiraishi2008-09-252-5/+3
* | | git-web--browse: Support for using /bin/start on MinGWPetr Baudis2008-09-242-2/+7
* | | Fixed some grammatical errors in git-rebase.txt documentation.Garry Dolley2008-09-241-4/+4
* | | Merge branch 'maint'Junio C Hamano2008-09-235-15/+17
|\ \ \ | |/ /
| * | builtin-prune.c: prune temporary packs in <object_dir>/pack directoryBrandon Casey2008-09-231-10/+12
| * | Do not perform cross-directory renames when creating packsPetr Baudis2008-09-224-5/+5
* | | Merge branch 'maint'Junio C Hamano2008-09-222-12/+10
|\ \ \ | |/ /
| * | Use dashless git commands in setgitperms.perlTodd Zullinger2008-09-221-2/+2
| * | git-remote: do not use user input in a printf format stringJohannes Sixt2008-09-221-10/+8
* | | git-svn: do a partial rebuild if rev_map is out-of-dateDeskin Miller2008-09-212-6/+20
* | | git-svn: testcase for partial rebuildDeskin Miler2008-09-211-0/+59
* | | Merge branch 'db/maint-checkout-b'Junio C Hamano2008-09-212-0/+22
|\ \ \
| * | | Check early that a new branch is new and validDaniel Barkalow2008-09-212-0/+22
| |/ /
* | | t5510: test "git fetch" following tags minimallyJunio C Hamano2008-09-211-0/+20
* | | Update draft release notes to 1.6.1Junio C Hamano2008-09-201-1/+21
* | | Merge branch 'maint'Junio C Hamano2008-09-198-39/+56
|\ \ \ | |/ /
| * | Start draft release notes for 1.6.0.3Junio C Hamano2008-09-192-1/+30
| * | git-repack uses --no-repack-object, not --no-repack-delta.Mikael Magnusson2008-09-192-2/+2
| * | Typo "bogos" in format-patch error message.Mikael Magnusson2008-09-191-1/+1
| * | builtin-clone: fix typoFabrizio Chiarello2008-09-191-1/+1
| * | Bust the ghost of long-defunct diffcore-pathspec.Yann Dirson2008-09-192-34/+22
| * | completion: git commit should list --interactiveEric Raible2008-09-191-1/+1
* | | bash: use for-each-ref format 'refname:short'SZEDER Gábor2008-09-191-20/+6
* | | Merge branch 'maint'Junio C Hamano2008-09-1812-39/+327
|\ \ \ | |/ /
| * | Merge branch 'dp/maint-rebase-fix' into maintJunio C Hamano2008-09-181-3/+11
| |\ \
| * \ \ Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano2008-09-185-2/+24
| |\ \ \