summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lt/unpack-trees'Junio C Hamano2008-03-1115-452/+503
|\
| * unpack_trees(): fix diff-index regression.Linus Torvalds2008-03-102-2/+18
| * traverse_trees_recursive(): propagate merge errors upJunio C Hamano2008-03-101-3/+4
| * unpack_trees(): minor memory leak fix in unused destination indexLinus Torvalds2008-03-091-0/+1
| * Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-098-153/+102
| * Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-097-39/+52
| * Add 'const' where appropriate to index handling functionsLinus Torvalds2008-03-094-16/+16
| * Fix tree-walking compare_entry() in the presense of --prefixLinus Torvalds2008-03-091-0/+3
| * Move 'unpack_trees()' over to 'traverse_trees()' interfaceLinus Torvalds2008-03-091-281/+249
| * Make 'traverse_trees()' traverse conflicting DF entries in parallelLinus Torvalds2008-03-093-4/+9
| * Add return value to 'traverse_tree()' callbackLinus Torvalds2008-03-093-13/+22
| * Make 'traverse_tree()' use linked structure rather than 'const char *base'Linus Torvalds2008-03-093-28/+78
| * Add 'df_name_compare()' helper functionLinus Torvalds2008-03-092-0/+36
* | Merge branch 'maint'Junio C Hamano2008-03-114-3/+37
|\ \
| * | git-svn: fix find-rev error message when missing argMarc-Andre Lureau2008-03-111-1/+2
| * | t0021: tr portability fix for SolarisJeff King2008-03-111-1/+3
| * | launch_editor(): allow spaces in the filenameJohannes Schindelin2008-03-112-1/+32
| * | git rebase --abort: always restore the right commitMike Hommey2008-03-112-3/+73
* | | Merge branch 'jc/cherry-pick' (early part)Junio C Hamano2008-03-116-389/+449
|\ \ \
| * | | expose a helper function peel_to_type().Junio C Hamano2008-02-182-19/+41
| * | | merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-184-369/+408
* | | | Merge branch 'maint'Junio C Hamano2008-03-111-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'kb/maint-filter-branch-disappear' into maintJunio C Hamano2008-03-112-1/+34
| |\ \ \
| * \ \ \ Merge branch 'aw/maint-shortlog-blank-lines' into maintJunio C Hamano2008-03-111-2/+3
| |\ \ \ \
| * | | | | git-pull documentation: warn about the option orderJunio C Hamano2008-03-101-0/+2
* | | | | | update 'git rebase' documentationSZEDER Gábor2008-03-102-4/+2
* | | | | | bash: fix long option with argument double completionSZEDER Gábor2008-03-101-7/+15
* | | | | | bash: Add more long options to be completed with "git --<TAB>"Teemu Likonen2008-03-101-0/+3
* | | | | | bash: use __gitdir when completing 'git rebase' optionsSZEDER Gábor2008-03-101-2/+2
* | | | | | bash: Remove completion of core.legacyheaders optionShawn O. Pearce2008-03-101-1/+0
* | | | | | bash: add 'git svn' subcommands and optionsSZEDER Gábor2008-03-101-1/+80
* | | | | | bash: add new 'git stash' subcommandsSZEDER Gábor2008-03-101-1/+1
* | | | | | bash: refactor searching for subcommands on the command lineSZEDER Gábor2008-03-101-39/+32
* | | | | | bash: remove unnecessary conditions when checking for subcommandsSZEDER Gábor2008-03-101-4/+4
* | | | | | bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with ...Kevin Ballard2008-03-101-4/+4
| |_|_|_|/ |/| | | |
* | | | | Add a test for read-tree -u --reset with a D/F conflictJeff King2008-03-081-0/+30
* | | | | Merge branch 'ph/parseopt'Junio C Hamano2008-03-086-23/+68
|\ \ \ \ \
| * | | | | parse-options: new option type to treat an option-like parameter as an argument.Pierre Habouzit2008-03-024-7/+39
| * | | | | parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseoptPierre Habouzit2008-03-022-16/+29
* | | | | | Merge branch 'dp/clean-fix'Junio C Hamano2008-03-0811-94/+123
|\ \ \ \ \ \
| * | | | | | git-clean: add tests for relative pathJunio C Hamano2008-03-071-0/+52
| * | | | | | git-clean: correct printing relative pathDmitry Potapov2008-03-071-18/+14
| * | | | | | Make private quote_path() in wt-status.c available as quote_path_relative()Dmitry Potapov2008-03-073-45/+48
| * | | | | | Revert part of d089eba (setup: sanitize absolute and funny paths in get_paths...Junio C Hamano2008-03-071-10/+1
| * | | | | | Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)Junio C Hamano2008-03-071-12/+0
| * | | | | | Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)Junio C Hamano2008-03-071-5/+1
| * | | | | | get_pathspec(): die when an out-of-tree path is givenJunio C Hamano2008-03-073-4/+7
* | | | | | | Merge branch 'ml/submodule-add-existing'Junio C Hamano2008-03-082-22/+33
|\ \ \ \ \ \ \
| * | | | | | | git-submodule - Allow adding a submodule in-placeMark Levedahl2008-03-052-22/+33
* | | | | | | | Merge branch 'mr/compat-snprintf'Junio C Hamano2008-03-085-0/+92
|\ \ \ \ \ \ \ \
View Lorry Controller Status