summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t0050: perl portability fixJeff King2008-03-131-2/+2
* tr portability fixesJeff King2008-03-124-6/+9
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-03-119-573/+724
|\
| * git-gui: Simplify MSGFMT setting in MakefileJunio C Hamano2008-03-121-6/+1
| * git-gui: Add option for changing the width of the commit message text boxAdam Piątyszek2008-03-072-1/+3
| * git-gui: if a background colour is set, set foreground colour as wellPhilipp A. Hartmann2008-03-056-16/+47
| * git-gui: translate the remaining messages in zh_cn.po to chineseeric miao2008-03-051-550/+673
| * Merge branch 'maint'Shawn O. Pearce2008-03-051-0/+5
| |\
* | \ Merge branch 'js/remote'Junio C Hamano2008-03-1112-3/+795
|\ \ \
| * | | "remote update": print remote name being fetched fromSamuel Tardieu2008-03-111-0/+1
| * | | builtin remote rm: remove symbolic refs, tooJohannes Schindelin2008-03-082-0/+6
| * | | remote: fix "update [group...]"Johannes Schindelin2008-03-052-9/+142
| * | | remote show: Clean up connection correctly if object fetch wasn't doneJohannes Schindelin2008-03-021-0/+1
| * | | builtin-remote: prune remotes correctly that were added with --mirrorJohannes Schindelin2008-03-012-3/+29
| * | | Make git-remote a builtinJohannes Schindelin2008-03-018-4/+556
| * | | Test "git remote show" and "git remote prune"Johannes Schindelin2008-03-011-0/+34
| * | | parseopt: add flag to stop on first non optionJohannes Schindelin2008-03-012-0/+3
| * | | path-list: add functions to work with unsorted listsJohannes Schindelin2008-03-012-1/+37
* | | | 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