summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/alternate-push'Shawn O. Pearce2008-09-2514-34/+114
|\
| * push: receiver end advertises refs from alternate repositoriesJunio C Hamano2008-09-093-0/+50
| * push: prepare sender to receive extended ref information from the receiverJunio C Hamano2008-09-095-10/+39
| * receive-pack: make it a builtinJunio C Hamano2008-09-094-4/+6
| * is_directory(): a generic helper functionJunio C Hamano2008-09-096-20/+19
* | Merge branch 'am/status'Shawn O. Pearce2008-09-252-15/+30
|\ \
| * | wt-status: Teach how to discard changes in the working directoryAnders Melchiorsen2008-09-082-0/+11
| * | wt-status: Split header generation into three functionsAnders Melchiorsen2008-09-081-15/+19
* | | Merge branch 'pb/autocorrect-wrapper'Shawn O. Pearce2008-09-251-8/+24
|\ \ \
| * | | git wrapper: also use aliases to correct mistyped commandsPieter de Bie2008-09-121-8/+24
* | | | Merge branch 'mv/commit-tree'Shawn O. Pearce2008-09-255-57/+79
|\ \ \ \
| * | | | t7603: add new testcases to ensure builtin-commit uses reduce_heads()Miklos Vajna2008-09-111-0/+53
| * | | | builtin-commit: use commit_tree()Miklos Vajna2008-09-111-51/+16
| * | | | commit_tree(): add a new author parameterMiklos Vajna2008-09-113-6/+10
| |/ / /
* | | | Merge branch 'jc/apply-include-exclude'Shawn O. Pearce2008-09-252-16/+46
|\ \ \ \
| * | | | git-apply:--include=pathspecJunio C Hamano2008-09-072-16/+46
* | | | | Merge branch 'jc/safe-c-l-d'Shawn O. Pearce2008-09-251-1/+5
|\ \ \ \ \
| * | | | | safe_create_leading_directories(): make it about "leading" directoriesJunio C Hamano2008-09-041-1/+5
* | | | | | gitweb: shortlog now also obeys $hash_parentGiuseppe Bilotta2008-09-251-1/+5
* | | | | | Merge branch 'ho/dirstat-by-file'Shawn O. Pearce2008-09-253-1/+13
|\ \ \ \ \ \
| * | | | | | diff --dirstat-by-file: count changed files, not linesHeikki Orsila2008-09-053-1/+13
| | |/ / / / | |/| | | |
* | | | | | 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-251-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-252-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