aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2008-03-14
|\
| * Merge branch 'ph/maint-quiltimport' into maintJunio C Hamano2008-03-14
| |\
| | * quiltimport: fix misquoting of parsed -p<num> parameterJunio C Hamano2008-03-12
| | * git-quiltimport: better parser to grok "enhanced" series files.Pierre Habouzit2008-03-09
| * | merge-file: handle empty files gracefullyJohannes Schindelin2008-03-13
| * | merge-recursive: handle file mode changesClemens Buchacher2008-03-13
| * | Minor wording changes in the keyboard descriptions in git-add --interactive.Vineet Kumar2008-03-13
| * | git fetch: Take '-n' to mean '--no-tags'Johannes Schindelin2008-03-13
* | | read-tree() and unpack_trees(): use consistent limitJunio C Hamano2008-03-13
* | | pack-objects: proper pack time stamping with --max-pack-sizeNicolas Pitre2008-03-13
* | | Merge branch 'maint'Junio C Hamano2008-03-12
|\ \ \ | |/ /
| * | git-cvsimport: fix merging with remote parent branchMarc-Andre Lureau2008-03-12
| * | gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' formJakub Narebski2008-03-12
* | | gc: call "prune --expire 2.weeks.ago" by defaultJohannes Schindelin2008-03-12
* | | Documentation/config: typofixJunio C Hamano2008-03-12
* | | Merge git://repo.or.cz/git-guiJunio C Hamano2008-03-11
|\ \ \
| * | | git-gui: Simplify MSGFMT setting in MakefileJunio C Hamano2008-03-12
| * | | git-gui: Add option for changing the width of the commit message text boxAdam Piątyszek2008-03-07
| * | | git-gui: if a background colour is set, set foreground colour as wellPhilipp A. Hartmann2008-03-05
| * | | git-gui: translate the remaining messages in zh_cn.po to chineseeric miao2008-03-05
| * | | Merge branch 'maint'Shawn O. Pearce2008-03-05
| |\ \ \
* | \ \ \ Merge branch 'js/remote'Junio C Hamano2008-03-11
|\ \ \ \ \
| * | | | | "remote update": print remote name being fetched fromSamuel Tardieu2008-03-11
| * | | | | builtin remote rm: remove symbolic refs, tooJohannes Schindelin2008-03-08
| * | | | | remote: fix "update [group...]"Johannes Schindelin2008-03-05
| * | | | | remote show: Clean up connection correctly if object fetch wasn't doneJohannes Schindelin2008-03-02
| * | | | | builtin-remote: prune remotes correctly that were added with --mirrorJohannes Schindelin2008-03-01
| * | | | | Make git-remote a builtinJohannes Schindelin2008-03-01
| * | | | | Test "git remote show" and "git remote prune"Johannes Schindelin2008-03-01
| * | | | | parseopt: add flag to stop on first non optionJohannes Schindelin2008-03-01
| * | | | | path-list: add functions to work with unsorted listsJohannes Schindelin2008-03-01
* | | | | | Merge branch 'lt/unpack-trees'Junio C Hamano2008-03-11
|\ \ \ \ \ \
| * | | | | | unpack_trees(): fix diff-index regression.Linus Torvalds2008-03-10
| * | | | | | traverse_trees_recursive(): propagate merge errors upJunio C Hamano2008-03-10
| * | | | | | unpack_trees(): minor memory leak fix in unused destination indexLinus Torvalds2008-03-09
| * | | | | | Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-09
| * | | | | | Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-09
| * | | | | | Add 'const' where appropriate to index handling functionsLinus Torvalds2008-03-09
| * | | | | | Fix tree-walking compare_entry() in the presense of --prefixLinus Torvalds2008-03-09
| * | | | | | Move 'unpack_trees()' over to 'traverse_trees()' interfaceLinus Torvalds2008-03-09
| * | | | | | Make 'traverse_trees()' traverse conflicting DF entries in parallelLinus Torvalds2008-03-09
| * | | | | | Add return value to 'traverse_tree()' callbackLinus Torvalds2008-03-09
| * | | | | | Make 'traverse_tree()' use linked structure rather than 'const char *base'Linus Torvalds2008-03-09
| * | | | | | Add 'df_name_compare()' helper functionLinus Torvalds2008-03-09
* | | | | | | Merge branch 'maint'Junio C Hamano2008-03-11
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | git-svn: fix find-rev error message when missing argMarc-Andre Lureau2008-03-11
| * | | | | | t0021: tr portability fix for SolarisJeff King2008-03-11
| * | | | | | launch_editor(): allow spaces in the filenameJohannes Schindelin2008-03-11
| * | | | | | git rebase --abort: always restore the right commitMike Hommey2008-03-11
* | | | | | | Merge branch 'jc/cherry-pick' (early part)Junio C Hamano2008-03-11
|\ \ \ \ \ \ \