summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-12-26Makefile: FreeBSD (both 7 and 8) needs OLD_ICONVLibravatar Junio C Hamano1-0/+1
2009-12-26Start 1.6.6.X maintenance trackLibravatar Junio C Hamano2-1/+16
2009-12-26Merge branch 'jc/maint-obsd46' into maintLibravatar Junio C Hamano2-29/+29
2009-12-26Add git-http-backend to command-list.Libravatar Tarmigan Casebolt1-0/+1
2009-12-26Kick off 1.7.0 cycleLibravatar Junio C Hamano3-2/+66
2009-12-26Merge branch 'gb/1.7.0-diff-whitespace-only-output'Libravatar Junio C Hamano2-10/+39
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Libravatar Junio C Hamano8-13/+105
2009-12-26Merge branch 'jc/1.7.0-push-safety'Libravatar Junio C Hamano8-58/+54
2009-12-26Merge branch 'jc/1.7.0-send-email-no-thread-default'Libravatar Junio C Hamano2-6/+6
2009-12-26Merge branch 'sr/vcs-helper'Libravatar Junio C Hamano21-48/+1322
2009-12-26t4019 "grep" portability fixLibravatar Junio C Hamano1-28/+28
2009-12-26t1200: work around a bug in some implementations of "find"Libravatar Junio C Hamano1-1/+1
2009-12-23Git 1.6.6Libravatar Junio C Hamano3-4/+6
2009-12-23git svn: add test for a git svn gc followed by a git svn mkdirsLibravatar Robert Zeh1-0/+40
2009-12-23git svn: branch/tag commands detect username in URLsLibravatar Eric Wong1-1/+2
2009-12-22Merge branch 'maint'Libravatar Junio C Hamano2-3/+23
2009-12-22git svn: lookup new parents correctly from svn:mergeinfoLibravatar Eric Wong1-1/+2
2009-12-22Prevent git blame from segfaulting on a missing author nameLibravatar David Reiss2-3/+23
2009-12-21git-svn: Remove obsolete MAXPARENT checkLibravatar Andrew Myrick1-6/+0
2009-12-21git-svn: detect cherry-picks correctly.Libravatar Sam Vilain2-25/+66
2009-12-21git-svn: exclude already merged tips using one rev-list callLibravatar Sam Vilain1-4/+48
2009-12-21git-svn: fix some mistakes with interpreting SVN mergeinfo commit rangesLibravatar Sam Vilain2-10/+4
2009-12-21git-svn: memoize conversion of SVN merge ticket info to git commit rangesLibravatar Sam Vilain1-37/+54
2009-12-21git-svn: expand the svn mergeinfo test suite, highlighting some failuresLibravatar Sam Vilain3-172/+860
2009-12-21update release notes for git svn in 1.6.6Libravatar Eric Wong1-0/+2
2009-12-21git svn: fix --revision when fetching deleted pathsLibravatar Eric Wong1-1/+5
2009-12-20Git 1.6.6-rc4Libravatar Junio C Hamano2-8/+9
2009-12-19Merge branch 'maint'Libravatar Junio C Hamano3-5/+57
2009-12-19rebase -i: abort cleanly if the editor fails to launchLibravatar Björn Gustavsson1-1/+1
2009-12-19t9146: use 'svn_cmd' wrapperLibravatar Eric Wong1-1/+1
2009-12-19git svn: make empty directory creation gc-awareLibravatar Eric Wong2-11/+58
2009-12-17technical-docs: document hash APILibravatar Stephen Boyd1-2/+48
2009-12-17api-strbuf.txt: fix typos and document launch_editor()Libravatar Stephen Boyd1-2/+8
2009-12-16Git 1.6.6-rc3Libravatar Junio C Hamano2-7/+1
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Libravatar Junio C Hamano10-8/+91
2009-12-16Git 1.6.5.7Libravatar Junio C Hamano4-3/+23
2009-12-16worktree: don't segfault with an absolute pathspec without a work treeLibravatar Junio C Hamano2-2/+20
2009-12-16ignore unknown color configurationLibravatar Jeff King4-3/+26
2009-12-15help.autocorrect: do not run a command if the command given is junkLibravatar Johannes Sixt1-2/+5
2009-12-15filter-branch: remove an unnecessary use of 'git read-tree'Libravatar Johannes Sixt1-1/+0
2009-12-14Illustrate "filter" attribute with an exampleLibravatar Nanako Shiraishi1-0/+19
2009-12-14commit: correctly respect skip-worktree bitLibravatar Nguyễn Thái Ngọc Duy2-6/+9
2009-12-14ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDLibravatar Nguyễn Thái Ngọc Duy5-9/+26
2009-12-13octopus: remove dead codeLibravatar Stephen Boyd1-5/+1
2009-12-13octopus: reenable fast-forward mergesLibravatar Stephen Boyd2-1/+19
2009-12-13octopus: make merge process simpler to followLibravatar Stephen Boyd2-4/+38
2009-12-12bash: Support new 'git fetch' optionsLibravatar Björn Gustavsson1-2/+12
2009-12-12status/commit: do not suggest "reset HEAD <path>" while mergingLibravatar Junio C Hamano4-5/+13
2009-12-12commit/status: "git add <path>" is not necessarily how to resolveLibravatar Junio C Hamano2-2/+2
2009-12-12commit/status: check $GIT_DIR/MERGE_HEAD only onceLibravatar Junio C Hamano1-6/+4