summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-03-08Add a test for read-tree -u --reset with a D/F conflictLibravatar Jeff King1-0/+30
2008-03-08Merge branch 'ph/parseopt'Libravatar Junio C Hamano6-23/+68
2008-03-08Merge branch 'dp/clean-fix'Libravatar Junio C Hamano11-94/+123
2008-03-08Merge branch 'ml/submodule-add-existing'Libravatar Junio C Hamano2-22/+33
2008-03-08Merge branch 'mr/compat-snprintf'Libravatar Junio C Hamano5-0/+92
2008-03-08Merge branch 'sp/fetch-optim'Libravatar Junio C Hamano11-24/+338
2008-03-08Merge branch 'jc/describe-always'Libravatar Junio C Hamano2-32/+44
2008-03-08Merge branch 'jc/am'Libravatar Junio C Hamano5-16/+118
2008-03-08Merge branch 'cr/reset-parseopt'Libravatar Junio C Hamano1-27/+20
2008-03-08Merge branch 'jn/gitweb-pickaxe'Libravatar Junio C Hamano1-42/+43
2008-03-08Merge branch 'kb/maint-filter-branch-disappear'Libravatar Junio C Hamano2-1/+34
2008-03-08Merge branch 'maint' to sync with 1.5.4.4Libravatar Junio C Hamano7-14/+39
2008-03-08GIT 1.5.4.4Libravatar Junio C Hamano2-7/+27
2008-03-08ident.c: reword error message when the user name cannot be determinedLibravatar Santi Béjar1-1/+1
2008-03-08Fix dcommit, rebase when rewriteRoot is in useLibravatar John Goerzen1-1/+6
2008-03-08filter-branch: handle "disappearing tree" case correctly in subdir filterLibravatar Junio C Hamano2-1/+34
2008-03-08merge-tool documentation: describe custom command usageLibravatar Charles Bailey1-0/+22
2008-03-08git-mergetool documentaiton: show toolnames in typewriter fontLibravatar Charles Bailey1-8/+8
2008-03-08Really make the LF after reset in fast-import optionalLibravatar Adeodato Simó2-1/+4
2008-03-08Merge branch 'aw/maint-shortlog-blank-lines'Libravatar Junio C Hamano1-2/+3
2008-03-08Merge branch 'mh/maint-http-proxy-fix' into maintLibravatar Junio C Hamano7-12/+22
2008-03-08Merge branch 'js/maint-daemon' into maintLibravatar Junio C Hamano1-5/+13
2008-03-08Merge branch 'js/maint-cvsexport' into maintLibravatar Junio C Hamano2-8/+67
2008-03-08Merge branch 'jc/maint-log-merge-left-right' into maintLibravatar Junio C Hamano1-8/+4
2008-03-08Merge branch 'ew/maint-svn-cert-fileprovider' into maintLibravatar Junio C Hamano1-0/+1
2008-03-07Merge branch 'maint'Libravatar Junio C Hamano4-12/+27
2008-03-07send-email: --no-signed-off-cc should suppress 'sob' ccLibravatar Junio C Hamano1-1/+2
2008-03-07Merge branch 'js/reflog-delete'Libravatar Junio C Hamano8-7/+245
2008-03-07Merge branch 'dc/format-pretty'Libravatar Junio C Hamano8-9/+21
2008-03-07Merge branch 'cb/mergetool'Libravatar Junio C Hamano3-76/+162
2008-03-07git-clean: add tests for relative pathLibravatar Junio C Hamano1-0/+52
2008-03-07git-clean: correct printing relative pathLibravatar Dmitry Potapov1-18/+14
2008-03-07Make private quote_path() in wt-status.c available as quote_path_relative()Libravatar Dmitry Potapov3-45/+48
2008-03-07git-gui: Add option for changing the width of the commit message text boxLibravatar Adam Piątyszek2-1/+3
2008-03-07unquote_c_style: fix off-by-one.Libravatar Pierre Habouzit1-1/+1
2008-03-07test-lib: fix TERM to dumb for test repeatabilityLibravatar Junio C Hamano1-7/+17
2008-03-07config.txt: refer to --upload-pack and --receive-pack instead of --execLibravatar Uwe Kleine-König1-4/+4
2008-03-07Merge branch 'ar/sgid-bsd'Libravatar Junio C Hamano3-1/+11
2008-03-07Merge branch 'cc/run-command'Libravatar Junio C Hamano2-10/+11
2008-03-07Revert part of d089eba (setup: sanitize absolute and funny paths in get_paths...Libravatar Junio C Hamano1-10/+1
2008-03-07Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)Libravatar Junio C Hamano1-12/+0
2008-03-07Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)Libravatar Junio C Hamano1-5/+1
2008-03-07get_pathspec(): die when an out-of-tree path is givenLibravatar Junio C Hamano3-4/+7
2008-03-06Merge branch 'maint' of git://repo.or.cz/git-gui into maintLibravatar Junio C Hamano1-0/+5
2008-03-05git-gui: if a background colour is set, set foreground colour as wellLibravatar Philipp A. Hartmann6-16/+47
2008-03-05git-gui: translate the remaining messages in zh_cn.po to chineseLibravatar eric miao1-550/+673
2008-03-05gitweb: Fix and simplify pickaxe searchLibravatar Jakub Narebski1-42/+43
2008-03-05git-submodule - Allow adding a submodule in-placeLibravatar Mark Levedahl2-22/+33
2008-03-05shortlog: take the first populated line of the descriptionLibravatar Andy Whitcroft1-2/+3
2008-03-05Add compat/snprintf.c for systems that return bogusLibravatar Michal Rokos5-0/+92