summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2006-12-21parse-remote: mark all refs not for merge only when fetching more than oneLibravatar Junio C Hamano1-2/+9
2006-12-21Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2006-12-21git-reset --hard: tell the user what the HEAD was reset toLibravatar Johannes Schindelin1-1/+6
2006-12-21git-tag: support -F <file> optionLibravatar Johannes Schindelin2-1/+16
2006-12-21Revert "git-pull: refuse default merge without branch.*.merge"Libravatar Junio C Hamano1-2/+1
2006-12-21Suggest 'add' in am/revert/cherry-pick.Libravatar Shawn O. Pearce2-3/+3
2006-12-21Use git-merge-file in git-merge-one-file, tooLibravatar Johannes Schindelin1-1/+1
2006-12-21diff --check: fix off by one errorLibravatar Johannes Schindelin1-2/+2
2006-12-20Documentation/git-branch: new -r to delete remote-tracking branches.Libravatar Quy Tonthat1-5/+8
2006-12-20Fix system header problems on Mac OS XLibravatar Terje Sten Bjerkseth1-0/+2
2006-12-20git reflog expireLibravatar Junio C Hamano4-0/+178
2006-12-20Move in_merge_bases() to commit.cLibravatar Junio C Hamano3-20/+19
2006-12-20reflog: fix warning message.Libravatar Junio C Hamano1-3/+9
2006-12-20Teach git-repack to preserve objects referred to by reflog entries.Libravatar Junio C Hamano3-9/+52
2006-12-20Protect commits recorded in reflog from pruning.Libravatar Junio C Hamano2-0/+38
2006-12-20add for_each_reflog_ent() iteratorLibravatar Junio C Hamano2-0/+29
2006-12-20Merge branch 'ew/svn-pm'Libravatar Junio C Hamano10-1087/+198
2006-12-20diff documentation: mostly talk about <commit>Libravatar Junio C Hamano1-2/+2
2006-12-20Merge branch 'jc/leftright'Libravatar Junio C Hamano5-10/+43
2006-12-20Merge branch 'jc/blame'Libravatar Junio C Hamano1-2/+31
2006-12-20Merge branch 'jc/branch-remove-remote'Libravatar Junio C Hamano1-26/+62
2006-12-20Merge branch 'jc/clone'Libravatar Junio C Hamano13-85/+52
2006-12-20compat/inet_ntop: do not use u_intLibravatar Junio C Hamano1-1/+1
2006-12-20spurious .sp in manpagesLibravatar Junio C Hamano1-0/+14
2006-12-20git-add: error out when given no arguments.Libravatar Junio C Hamano1-0/+5
2006-12-20revision: --skip=<n>Libravatar Junio C Hamano4-14/+89
2006-12-20Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2006-12-20GIT 1.4.4.3Libravatar Junio C Hamano1-1/+1
2006-12-20clarify some error messages wrt unknown object typesLibravatar Nicolas Pitre2-3/+3
2006-12-20simplify inclusion of system header files.Libravatar Junio C Hamano72-201/+42
2006-12-20index-pack usage of mmap() is unacceptably slower on many OSes other than LinuxLibravatar Nicolas Pitre1-13/+14
2006-12-19gitweb: Show '...' links in "summary" view only if there are more itemsLibravatar Robert Fitzsimons1-2/+9
2006-12-19config_rename_section: fix FILE* leakLibravatar Junio C Hamano1-6/+13
2006-12-19Remove COLLISION_CHECK from Makefile since it's not used.Libravatar Brian Gernhardt2-8/+0
2006-12-19fix populate-filespecLibravatar Junio C Hamano1-1/+1
2006-12-19git-cvsserver: fix breakage when calling git merge-fileLibravatar Eric Wong1-1/+1
2006-12-19Revert "Make left-right automatic."Libravatar Junio C Hamano2-11/+3
2006-12-19Move "no merge candidate" warning into git-pullLibravatar Josef Weidendorfer2-10/+4
2006-12-19Use preprocessor constants for environment variable names.Libravatar Junio C Hamano6-12/+16
2006-12-19Do not create $GIT_DIR/remotes/ directory anymore.Libravatar Junio C Hamano2-5/+3
2006-12-19Merge branch 'jc/test-clone' into jc/cloneLibravatar Junio C Hamano29-106/+564
2006-12-19Introduce GIT_TEMPLATE_DIRLibravatar Johannes Schindelin2-3/+7
2006-12-19Revert "fix testsuite: make sure they use templates freshly built from the so...Libravatar Junio C Hamano11-36/+26
2006-12-18git-add --interactive: hunk splittingLibravatar Junio C Hamano1-8/+242
2006-12-18git-add --interactiveLibravatar Junio C Hamano4-0/+587
2006-12-18blame: -b (blame.blankboundary) and --root (blame.showroot)Libravatar Junio C Hamano1-2/+31
2006-12-18git-branch -d: do not stop at the first failure.Libravatar Quy Tonthat1-18/+39
2006-12-18Teach git-branch to delete tracking branches with -r -dLibravatar Junio C Hamano1-13/+28
2006-12-18fix testsuite: make sure they use templates freshly built from the sourceLibravatar Junio C Hamano11-26/+36
2006-12-18rerere: fix breakage of resolving.Libravatar Junio C Hamano1-1/+1