summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bk/maint-cvsexportcommit'Junio C Hamano2007-11-011-3/+10
|\
| * cvsexportcommit: fix for commits that do not have parentsBrad King2007-10-311-3/+10
* | Do no colorify test output if stdout is not a terminalAlex Riesen2007-11-011-0/+1
* | Merge branch 'js/forkexec'Junio C Hamano2007-11-0113-367/+331
|\ \
| * | Use the asyncronous function infrastructure to run the content filter.Johannes Sixt2007-10-211-33/+28
| * | Avoid a dup2(2) in apply_filter() - start_command() can do it for us.Johannes Sixt2007-10-211-4/+3
| * | t0021-conversion.sh: Test that the clean filter really cleans content.Johannes Sixt2007-10-211-1/+6
| * | upload-pack: Run rev-list in an asynchronous function.Johannes Sixt2007-10-211-28/+18
| * | upload-pack: Move the revision walker into a separate function.Johannes Sixt2007-10-211-33/+37
| * | Use the asyncronous function infrastructure in builtin-fetch-pack.c.Johannes Sixt2007-10-211-21/+18
| * | Add infrastructure to run a function asynchronously.Johannes Sixt2007-10-212-8/+65
| * | upload-pack: Use start_command() to run pack-objects in create_pack_file().Johannes Sixt2007-10-211-61/+44
| * | Have start_command() create a pipe to read the stderr of the child.Johannes Sixt2007-10-212-2/+25
| * | Use start_comand() in builtin-fetch-pack.c instead of explicit fork/exec.Johannes Sixt2007-10-211-40/+16
| * | Use run_command() to spawn external diff programs instead of fork/exec.Johannes Sixt2007-10-211-35/+3
| * | Use start_command() to run content filters instead of explicit fork/exec.Johannes Sixt2007-10-211-23/+7
| * | Use start_command() in git_connect() instead of explicit fork/exec.Johannes Sixt2007-10-211-55/+48
| * | Change git_connect() to return a struct child_process instead of a pid_t.Johannes Sixt2007-10-217-43/+33
* | | Merge branch 'sp/mergetool'Junio C Hamano2007-10-312-44/+71
|\ \ \
| * | | mergetool: avoid misleading message "Resetting to default..."Steffen Prohaska2007-10-181-1/+1
| * | | mergetool: add support for ECMergeSteffen Prohaska2007-10-182-2/+12
| * | | mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska2007-10-182-43/+60
* | | | Merge branch 'sp/help'Junio C Hamano2007-10-316-178/+203
|\ \ \ \
| * | | | shell should call the new setup_path() to setup $PATHScott R Parish2007-10-291-7/+1
| * | | | include $PATH in generating list of commands for "help -a"Scott R Parish2007-10-291-37/+120
| * | | | use only the $PATH for exec'ing git commandsScott R Parish2007-10-293-105/+61
| * | | | list_commands(): simplify code by using chdir()Scott R Parish2007-10-291-15/+3
| * | | | "current_exec_path" is a misleading name, use "argv_exec_path"Scott R Parish2007-10-293-8/+8
| * | | | remove unused/unneeded "pattern" argument of list_commandsScott R Parish2007-10-291-6/+8
| * | | | "git" returns 1; "git help" and "git help -a" return 0Scott R Parish2007-10-293-6/+8
* | | | | Merge branch 'kh/commit'Junio C Hamano2007-10-317-67/+106
|\ \ \ \ \
| * | | | | Export rerere() and launch_editor().Kristian Høgsberg2007-09-272-5/+27
| * | | | | Introduce entry point add_interactive and add_files_to_cacheKristian Høgsberg2007-09-272-9/+18
| * | | | | Merge branch 'ph/strbuf' into kh/commitJunio C Hamano2007-09-2731-898/+731
| |\ \ \ \ \
| * | | | | | Enable wt-status to run against non-standard index file.Kristian Høgsberg2007-09-192-1/+3
| * | | | | | Enable wt-status output to a given FILE pointer.Kristian Høgsberg2007-09-194-52/+58
* | | | | | | Merge branch 'maint' to catch up with 1.5.3.5Junio C Hamano2007-10-312-6/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | GIT 1.5.3.5v1.5.3.5Junio C Hamano2007-10-312-7/+1
* | | | | | | Merge branch 'maint' into HEADJunio C Hamano2007-10-306-15/+23
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update GIT 1.5.3.5 Release NotesJunio C Hamano2007-10-301-1/+7
| * | | | | | git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Björn Steinbrink2007-10-301-0/+2
| * | | | | | git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Björn Steinbrink2007-10-301-2/+2
| * | | | | | Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink2007-10-301-1/+0
| * | | | | | Make merge-recursive honor diff.renamelimitLars Hjemli2007-10-301-0/+6
| * | | | | | cherry-pick/revert: more compact user direction messageNicolas Pitre2007-10-301-1/+1
| * | | | | | core-tutorial: Use new syntax for git-merge.Sergei Organov2007-10-301-4/+4
| * | | | | | git-merge: document but discourage the historical syntaxJunio C Hamano2007-10-301-5/+6
| * | | | | | Prevent send-pack from segfaulting (backport from 'master')Junio C Hamano2007-10-301-1/+4
| * | | | | | Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in exampleMichael W. Olson2007-10-301-1/+1
* | | | | | | Merge branch 'nd/worktree' into HEADJunio C Hamano2007-10-301-1/+1
|\ \ \ \ \ \ \