summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Remove empty directories in recursive mergeAlex Riesen2008-09-262-3/+12
| * | | | | Documentation: clarify the details of overriding LESS via core.pagerChris Frey2008-09-261-2/+11
* | | | | | Cleanup remove_pathAlex Riesen2008-09-261-5/+3
* | | | | | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-258-1454/+1580
|\ \ \ \ \ \
| * | | | | | builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-062-0/+23
| * | | | | | merge-recursive: get rid of virtual_idMiklos Vajna2008-09-051-5/+1
| * | | | | | merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-042-27/+34
| * | | | | | merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-042-19/+19
| * | | | | | merge-recursive: get rid of the index_only global variableMiklos Vajna2008-09-041-73/+67
| * | | | | | merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-032-13/+13
| * | | | | | cherry-pick/revert: make direct internal call to merge_tree()Miklos Vajna2008-09-021-40/+43
| * | | | | | builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna2008-08-301-29/+63
| * | | | | | merge-recursive: introduce merge_optionsMiklos Vajna2008-08-304-169/+192
| * | | | | | merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-303-46/+75
| * | | | | | Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-304-1324/+1341
* | | | | | | 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-072-0/+11
| * | | | | | | | wt-status: Split header generation into three functionsAnders Melchiorsen2008-09-071-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-111-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-101-0/+53
| * | | | | | | | | | builtin-commit: use commit_tree()Miklos Vajna2008-09-101-51/+16
| * | | | | | | | | | commit_tree(): add a new author parameterMiklos Vajna2008-09-103-6/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/apply-include-exclude'Shawn O. Pearce2008-09-252-16/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-apply:--include=pathspecJunio C Hamano2008-09-062-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-031-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
View Lorry Controller Status