Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge-recursive: introduce merge_options | Miklos Vajna | 2008-08-30 | 4 | -169/+192 |
* | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer | 2008-08-30 | 3 | -46/+75 |
* | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 2008-08-30 | 4 | -1324/+1341 |
* | Merge branch 'maint' | Junio C Hamano | 2008-08-30 | 7 | -13/+146 |
|\ | |||||
| * | gitattributes: -crlf is not binary | Junio C Hamano | 2008-08-30 | 1 | -3/+37 |
| * | git-apply: Loosen "match_beginning" logic | Junio C Hamano | 2008-08-30 | 2 | -4/+16 |
| * | Fix example in git-name-rev documentation | Junio C Hamano | 2008-08-30 | 1 | -1/+1 |
| * | Merge branch 'sp/missing-thin-base' into maint | Junio C Hamano | 2008-08-30 | 2 | -4/+91 |
| |\ | |||||
| | * | pack-objects: Allow missing base objects when creating thin packs | Shawn O. Pearce | 2008-08-12 | 2 | -4/+91 |
| * | | Merge branch 'af/maint-install-no-handlink' into maint | Junio C Hamano | 2008-08-29 | 1 | -11/+11 |
| |\ \ | |||||
| | * | | Fix use of hardlinks in "make install" | Alex Riesen | 2008-08-29 | 1 | -1/+1 |
| * | | | shell: do not play duplicated definition games to shrink the executable | Junio C Hamano | 2008-08-29 | 2 | -16/+1 |
| * | | | Merge branch 'np/verify-pack' into maint | Junio C Hamano | 2008-08-29 | 5 | -1/+22 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'sb/daemon' | Junio C Hamano | 2008-08-30 | 2 | -197/+107 |
|\ \ \ \ \ | |||||
| * | | | | | daemon.c: minor style fixup | Junio C Hamano | 2008-08-25 | 1 | -42/+34 |
| * | | | | | git-daemon: rewrite kindergarden, new option --max-connections | Stephen R. van den Berg | 2008-08-17 | 2 | -140/+82 |
| * | | | | | git-daemon: Simplify dead-children reaping logic | Stephen R. van den Berg | 2008-08-17 | 1 | -32/+23 |
| * | | | | | git-daemon: use LOG_PID, simplify logging code | Stephen R. van den Berg | 2008-08-17 | 1 | -31/+16 |
| * | | | | | git-daemon: call logerror() instead of error() | Stephen R. van den Berg | 2008-08-17 | 1 | -2/+2 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-08-29 | 11 | -12/+80 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | tutorial: gentler illustration of Alice/Bob workflow using gitk | Paolo Ciarrocchi | 2008-08-29 | 1 | -1/+28 |
| * | | | | | pretty=format: respect date format options | Jeff King | 2008-08-29 | 6 | -10/+22 |
| * | | | | | make git-shell paranoid about closed stdin/stdout/stderr | Paolo Bonzini | 2008-08-29 | 1 | -0/+13 |
| * | | | | | Document gitk --argscmd flag. | Yann Dirson | 2008-08-29 | 1 | -0/+7 |
| * | | | | | Fix '--dirstat' with cross-directory renaming | Linus Torvalds | 2008-08-29 | 1 | -0/+8 |
| * | | | | | for-each-ref: Allow a trailing slash in the patterns | Björn Steinbrink | 2008-08-29 | 1 | -1/+2 |
* | | | | | | git-p4: Fix checkout bug when using --import-local. | Tor Arvid Lund | 2008-08-29 | 1 | -2/+6 |
* | | | | | | list_commands: only call git_exec_path if it is needed | Alex Riesen | 2008-08-28 | 1 | -1/+1 |
* | | | | | | Allow git help work without PATH set | Alex Riesen | 2008-08-28 | 1 | -23/+20 |
* | | | | | | Make main_cmds and other_cmds local to builtin-help.c | Alex Riesen | 2008-08-28 | 1 | -1/+1 |
* | | | | | | Remove useless memset of static command name lists in builtin-merge.c | Alex Riesen | 2008-08-28 | 1 | -2/+0 |
* | | | | | | Remove calculation of the longest command name from where it is not used | Alex Riesen | 2008-08-28 | 4 | -28/+24 |
* | | | | | | dir.c: Avoid c99 array initialization | Brandon Casey | 2008-08-28 | 3 | -16/+10 |
* | | | | | | bash-completion: Add all submodule subcommands to the completion list | Matthias Kestenholz | 2008-08-28 | 1 | -1/+1 |
* | | | | | | Merge branch 'mv/merge-custom' | Junio C Hamano | 2008-08-27 | 8 | -508/+627 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t7606: fix custom merge test | Junio C Hamano | 2008-08-23 | 1 | -2/+5 |
| * | | | | | | Fix "git-merge -s bogo" help text | Junio C Hamano | 2008-08-20 | 1 | -3/+11 |
| * | | | | | | Update .gitignore to ignore git-help | Gustaf Hendeby | 2008-08-13 | 1 | -0/+1 |
| * | | | | | | Builtin git-help. | Miklos Vajna | 2008-08-02 | 4 | -465/+470 |
| * | | | | | | builtin-help: always load_command_list() in cmd_help() | Miklos Vajna | 2008-07-30 | 1 | -1/+1 |
| * | | | | | | Add a second testcase for handling invalid strategies in git-merge | Miklos Vajna | 2008-07-29 | 1 | -0/+4 |
| * | | | | | | Add a new test for using a custom merge strategy | Miklos Vajna | 2008-07-29 | 1 | -0/+46 |
| * | | | | | | builtin-merge: allow using a custom strategy | Miklos Vajna | 2008-07-29 | 1 | -7/+35 |
| * | | | | | | builtin-help: make some internal functions available to other builtins | Miklos Vajna | 2008-07-29 | 3 | -38/+63 |
* | | | | | | | Merge branch 'ml/submodule' | Junio C Hamano | 2008-08-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-submodule.sh - Remove trailing / from URL if found | Mark Levedahl | 2008-08-21 | 1 | -2/+3 |
| * | | | | | | | git-submodule.sh - Remove trailing / from URL if found | Mark Levedahl | 2008-08-20 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'am/cherry-pick-rerere' | Junio C Hamano | 2008-08-27 | 2 | -0/+47 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | 2008-08-11 | 2 | -0/+47 |
* | | | | | | | | | Merge branch 'jc/add-addremove' | Junio C Hamano | 2008-08-27 | 3 | -69/+93 |
|\ \ \ \ \ \ \ \ \ |