summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2006-12-28Use merge-recursive in git-am -3.Libravatar Shawn O. Pearce1-2/+5
2006-12-28Allow merging bare trees in merge-recursive.Libravatar Shawn O. Pearce1-0/+3
2006-12-28Move better_branch_name above get_ref in merge-recursive.Libravatar Shawn O. Pearce1-12/+12
2006-12-28Merge branch 'jc/utf8'Libravatar Junio C Hamano18-43/+308
2006-12-28Allow non-fast-forward of remote tracking branches in default cloneLibravatar Junio C Hamano1-1/+1
2006-12-28core.logallrefupdates: log remotes/ tracking branches.Libravatar Junio C Hamano1-1/+2
2006-12-28GIT_SKIP_TESTS: allow users to omit tests that are known to breakLibravatar Junio C Hamano1-18/+70
2006-12-28t3900: test conversion to non UTF-8 as wellLibravatar Junio C Hamano1-0/+11
2006-12-28Merge branch 'jc/make'Libravatar Junio C Hamano1-6/+16
2006-12-28update hook: redirect _both_ diagnostic lines to stderr upon tag failureLibravatar Jim Meyering1-1/+1
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsLibravatar Johannes Schindelin2-0/+26
2006-12-28git-svn: sort multi-init outputLibravatar Eric Wong1-1/+1
2006-12-28git-svn: verify_ref() should actually --verifyLibravatar Eric Wong1-1/+2
2006-12-28git-svn: print out the SVN library version in --version, tooLibravatar Eric Wong1-1/+1
2006-12-28git-svn: remove non-delta fetch code pathsLibravatar Eric Wong2-176/+21
2006-12-28t9200-git-cvsexportcommit.sh: quiet down commitLibravatar Eric Wong1-4/+6
2006-12-28test-lib: quiet down init-db output for testsLibravatar Eric Wong1-1/+1
2006-12-28t6024-recursive-merge: quiet down this testLibravatar Eric Wong1-43/+47
2006-12-28Merge branch 'js/shallow'Libravatar Junio C Hamano9-48/+445
2006-12-28Allow git-merge to select the default strategy.Libravatar Shawn O. Pearce1-18/+0
2006-12-28Honor pull.{twohead,octopus} in git-merge.Libravatar Shawn O. Pearce1-2/+14
2006-12-28Ensure `git-pull` fails if `git-merge` fails.Libravatar Shawn O. Pearce1-1/+1
2006-12-28Use branch names in 'git-rebase -m' conflict hunks.Libravatar Shawn O. Pearce1-1/+10
2006-12-28Honor GIT_REFLOG_ACTION in git-rebase.Libravatar Shawn O. Pearce1-1/+2
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Libravatar Shawn O. Pearce7-41/+30
2006-12-28gitweb: Precompile CGI routines for mod_perlLibravatar Jakub Narebski1-0/+4
2006-12-28gitweb: Add mod_perl version string to "generator" meta headerLibravatar Jakub Narebski1-1/+2
2006-12-27Rename t3900 test vector fileLibravatar Junio C Hamano2-5/+5
2006-12-27gcc does not necessarily pass runtime libpath with -RLibravatar Junio C Hamano1-6/+16
2006-12-27Merge branch 'sp/gc'Libravatar Junio C Hamano6-4/+90
2006-12-27UTF-8: introduce i18n.logoutputencoding.Libravatar Junio C Hamano15-23/+160
2006-12-27Set NO_MMAP for Cygwin by defaultLibravatar Junio C Hamano1-2/+2
2006-12-27Use 'repack -a -d -l' instead of 'repack -a -d' in git-gcLibravatar Junio C Hamano1-1/+1
2006-12-27gitweb: Re-enable rev-list --parents for parse_commit.Libravatar Robert Fitzsimons1-5/+5
2006-12-27git-send-email: default value for "From:" field.Libravatar Quy Tonthat1-3/+2
2006-12-27Merge branch 'master' into js/shallowLibravatar Junio C Hamano226-6240/+9288
2006-12-27everyday: replace a few 'prune' and 'repack' with 'gc'Libravatar Junio C Hamano1-3/+6
2006-12-27Create 'git gc' to perform common maintenance operations.Libravatar Shawn O. Pearce5-1/+84
2006-12-27git-reflog: gc.* configuration and documentation.Libravatar Junio C Hamano4-2/+94
2006-12-27rerere gc: honor configuration and document itLibravatar Junio C Hamano3-2/+29
2006-12-27count-objects -v: show number of packs as well.Libravatar Junio C Hamano2-2/+5
2006-12-26Merge branch 'jc/fsck-reflog'Libravatar Junio C Hamano15-32/+373
2006-12-26everyday: update for v1.5.0Libravatar Junio C Hamano1-41/+48
2006-12-26git-svn: dcommit should diff against the current HEAD after committingLibravatar Eric Wong1-3/+3
2006-12-26git-svn: quiet down tests and fix some unportable shell constructsLibravatar Eric Wong1-131/+127
2006-12-26hooks/commit-msg: add example to add Signed-off-by line to messageLibravatar Andy Parkins1-0/+4
2006-12-26move git-blame to its place in .gitignoreLibravatar Nicolas Pitre1-1/+1
2006-12-26Add git-reflog to .gitignoreLibravatar Nicolas Pitre1-0/+1
2006-12-26Teach log family --encodingLibravatar Junio C Hamano3-5/+76
2006-12-26i18n.logToUTF8: convert commit log message to UTF-8Libravatar Junio C Hamano1-2/+9