summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 'maint'Junio C Hamano2008-08-307-13/+146
|\
| * gitattributes: -crlf is not binaryJunio C Hamano2008-08-301-3/+37
| * git-apply: Loosen "match_beginning" logicJunio C Hamano2008-08-302-4/+16
| * Fix example in git-name-rev documentationJunio C Hamano2008-08-301-1/+1
| * Merge branch 'sp/missing-thin-base' into maintJunio C Hamano2008-08-302-4/+91
| |\
| | * pack-objects: Allow missing base objects when creating thin packsShawn O. Pearce2008-08-122-4/+91
| * | Merge branch 'af/maint-install-no-handlink' into maintJunio C Hamano2008-08-291-11/+11
| |\ \
| | * | Fix use of hardlinks in "make install"Alex Riesen2008-08-291-1/+1
| * | | shell: do not play duplicated definition games to shrink the executableJunio C Hamano2008-08-292-16/+1
| * | | Merge branch 'np/verify-pack' into maintJunio C Hamano2008-08-295-1/+22
| |\ \ \
* | \ \ \ Merge branch 'sb/daemon'Junio C Hamano2008-08-302-197/+107
|\ \ \ \ \
| * | | | | daemon.c: minor style fixupJunio C Hamano2008-08-251-42/+34
| * | | | | git-daemon: rewrite kindergarden, new option --max-connectionsStephen R. van den Berg2008-08-172-140/+82
| * | | | | git-daemon: Simplify dead-children reaping logicStephen R. van den Berg2008-08-171-32/+23
| * | | | | git-daemon: use LOG_PID, simplify logging codeStephen R. van den Berg2008-08-171-31/+16
| * | | | | git-daemon: call logerror() instead of error()Stephen R. van den Berg2008-08-171-2/+2
* | | | | | Merge branch 'maint'Junio C Hamano2008-08-2911-12/+80
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | tutorial: gentler illustration of Alice/Bob workflow using gitkPaolo Ciarrocchi2008-08-291-1/+28
| * | | | | pretty=format: respect date format optionsJeff King2008-08-296-10/+22
| * | | | | make git-shell paranoid about closed stdin/stdout/stderrPaolo Bonzini2008-08-291-0/+13
| * | | | | Document gitk --argscmd flag.Yann Dirson2008-08-291-0/+7
| * | | | | Fix '--dirstat' with cross-directory renamingLinus Torvalds2008-08-291-0/+8
| * | | | | for-each-ref: Allow a trailing slash in the patternsBjörn Steinbrink2008-08-291-1/+2
* | | | | | git-p4: Fix checkout bug when using --import-local.Tor Arvid Lund2008-08-291-2/+6
* | | | | | list_commands: only call git_exec_path if it is neededAlex Riesen2008-08-281-1/+1
* | | | | | Allow git help work without PATH setAlex Riesen2008-08-281-23/+20
* | | | | | Make main_cmds and other_cmds local to builtin-help.cAlex Riesen2008-08-281-1/+1
* | | | | | Remove useless memset of static command name lists in builtin-merge.cAlex Riesen2008-08-281-2/+0
* | | | | | Remove calculation of the longest command name from where it is not usedAlex Riesen2008-08-284-28/+24
* | | | | | dir.c: Avoid c99 array initializationBrandon Casey2008-08-283-16/+10
* | | | | | bash-completion: Add all submodule subcommands to the completion listMatthias Kestenholz2008-08-281-1/+1
* | | | | | Merge branch 'mv/merge-custom'Junio C Hamano2008-08-278-508/+627
|\ \ \ \ \ \
| * | | | | | t7606: fix custom merge testJunio C Hamano2008-08-231-2/+5
| * | | | | | Fix "git-merge -s bogo" help textJunio C Hamano2008-08-201-3/+11
| * | | | | | Update .gitignore to ignore git-helpGustaf Hendeby2008-08-131-0/+1
| * | | | | | Builtin git-help.Miklos Vajna2008-08-024-465/+470
| * | | | | | builtin-help: always load_command_list() in cmd_help()Miklos Vajna2008-07-301-1/+1
| * | | | | | Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna2008-07-291-0/+4
| * | | | | | Add a new test for using a custom merge strategyMiklos Vajna2008-07-291-0/+46
| * | | | | | builtin-merge: allow using a custom strategyMiklos Vajna2008-07-291-7/+35
| * | | | | | builtin-help: make some internal functions available to other builtinsMiklos Vajna2008-07-293-38/+63
* | | | | | | Merge branch 'ml/submodule'Junio C Hamano2008-08-271-1/+2
|\ \ \ \ \ \ \
| * | | | | | | git-submodule.sh - Remove trailing / from URL if foundMark Levedahl2008-08-211-2/+3
| * | | | | | | git-submodule.sh - Remove trailing / from URL if foundMark Levedahl2008-08-201-1/+1
View Lorry Controller Status