summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-08-23merge: fix numerus bugs around "trivial merge" areaLibravatar Junio C Hamano4-8/+32
2008-08-23unpack_trees(): protect the handcrafted in-core index from read_cache()Libravatar Junio C Hamano3-2/+6
2008-08-22git-p4: Fix one-liner in p4_write_pipe function.Libravatar Tor Arvid Lund1-1/+1
2008-08-22git-submodule: replace duplicated code with a module_list functionLibravatar David Aguilar1-4/+13
2008-08-22discard revindex data when pack list changesLibravatar Nicolas Pitre5-1/+22
2008-08-22git-merge documentation: more details about resolving conflictsLibravatar Dan Hensgen1-6/+18
2008-08-22Extend "checkout --track" DWIM to support more casesLibravatar Alex Riesen4-17/+46
2008-08-22Revert "Convert output messages in merge-recursive to past tense."Libravatar Jonathan del Strother1-18/+18
2008-08-22Completion: add missing '=' for 'diff --diff-filter'Libravatar Eric Raible1-1/+1
2008-08-22templates/Makefile: install is unnecessary, just use mkdir -pLibravatar Junio C Hamano1-2/+2
2008-08-22remote.c: add a function for deleting a refspec array and use it (twice)Libravatar Brandon Casey2-2/+28
2008-08-21filter-branch: Grok special characters in tag namesLibravatar Johannes Sixt2-5/+15
2008-08-21test-lib: do not remove trash_directory if called with --debugLibravatar Johannes Schindelin1-1/+1
2008-08-21provide more errors for the "merge into empty head" caseLibravatar Paolo Bonzini1-0/+5
2008-08-21Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'Libravatar Shawn O. Pearce1-1/+4
2008-08-21config.mak.in: Pass on LDFLAGS from configureLibravatar Neil Roberts1-0/+1
2008-08-21git-submodule.sh - Remove trailing / from URL if foundLibravatar Mark Levedahl1-2/+3
2008-08-21Fix 'git help help'Libravatar Miklos Vajna1-1/+2
2008-08-21Merge branch 'maint'Libravatar Junio C Hamano3-4/+10
2008-08-21compat/snprintf.c: handle snprintf's that always return the # chars transmittedLibravatar Brandon Casey1-0/+4
2008-08-20Teach "git diff -p" HTML funcname patternsLibravatar Johan Herland2-2/+5
2008-08-20Teach "git diff -p" Python funcname patternsLibravatar Kirill Smelkov2-0/+3
2008-08-20git-svn: fix dcommit to urls with embedded usernamesLibravatar Eric Wong1-3/+5
2008-08-20Merge branch 'ml/submodule-foreach'Libravatar Junio C Hamano2-2/+39
2008-08-20Merge branch 'pm/log-exit-code'Libravatar Junio C Hamano2-2/+11
2008-08-20Merge branch 'sb/commit-tree-minileak'Libravatar Junio C Hamano1-1/+4
2008-08-20Merge branch 'pb/reflog-dwim'Libravatar Junio C Hamano1-4/+4
2008-08-20Merge branch 'jc/add-stop-at-symlink'Libravatar Junio C Hamano4-3/+45
2008-08-20Merge branch 'kh/diff-tree'Libravatar Junio C Hamano3-17/+72
2008-08-20Merge branch 'mg/count-objects'Libravatar Junio C Hamano3-3/+7
2008-08-20Merge branch 'mz/push-verbose'Libravatar Junio C Hamano1-2/+11
2008-08-20Merge branch 'jc/index-extended-flags'Libravatar Junio C Hamano2-0/+5
2008-08-20Merge branch 'cc/merge-base-many'Libravatar Junio C Hamano5-28/+133
2008-08-20Merge branch 'jc/test-deeper'Libravatar Junio C Hamano50-131/+152
2008-08-20Merge branch 'js/parallel-test'Libravatar Junio C Hamano4-7/+14
2008-08-20git-submodule.sh - Remove trailing / from URL if foundLibravatar Mark Levedahl1-1/+1
2008-08-20Fix "git-merge -s bogo" help textLibravatar Junio C Hamano1-3/+11
2008-08-20revision.h: make show_early_output an extern which is defined in revision.cLibravatar Brandon Casey1-1/+1
2008-08-20Update draft release notes for 1.6.1Libravatar Junio C Hamano1-5/+21
2008-08-20Merge branch 'maint'Libravatar Junio C Hamano18-23/+108
2008-08-20Update draft release notes for 1.6.0.1Libravatar Junio C Hamano1-2/+18
2008-08-20Add hints to revert documentation about other ways to undo changesLibravatar Tarmigan Casebolt1-0/+9
2008-08-20Install templates with the user and group of the installing personalityLibravatar Johannes Sixt1-1/+1
2008-08-20"git-merge": allow fast-forwarding in a stat-dirty treeLibravatar Junio C Hamano2-1/+11
2008-08-20completion: find out supported merge strategies correctlyLibravatar Junio C Hamano1-6/+8
2008-08-20decorate: allow const objects to be decoratedLibravatar Jeff King2-8/+9
2008-08-20for-each-ref: cope with tags with incomplete linesLibravatar Junio C Hamano2-1/+13
2008-08-20diff --check: do not get confused by new blank lines in the middleLibravatar Junio C Hamano2-0/+12
2008-08-20Build-in "git-shell"Libravatar Junio C Hamano4-3/+6
2008-08-19Merge branch 'bd/diff-strbuf'Libravatar Junio C Hamano5-71/+53