summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-10-19Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2008-10-19Fix mismerge at cdb22c4 in builtin-checkout.cLibravatar Junio C Hamano1-3/+0
2008-10-19git-merge-recursive: honor merge.conflictstyle once againLibravatar Matt McCutchen1-1/+1
2008-10-19Documentation: add manpage about workflowsLibravatar Thomas Rast2-1/+365
2008-10-19Documentation: Spelling fixLibravatar Fredrik Skolmli1-1/+1
2008-10-19Merge branch 'pb/rename-rowin32'Libravatar Junio C Hamano1-2/+3
2008-10-19Enhance hold_lock_file_for_{update,append}() APILibravatar Junio C Hamano11-23/+39
2008-10-19demonstrate breakage of detached checkout with symbolic link HEADLibravatar Junio C Hamano1-0/+12
2008-10-18Documentation: Clarify '--signoff' for git-commitLibravatar Abhijit Bhopatkar1-1/+2
2008-10-18reset --hard/read-tree --reset -u: remove unmerged new pathsLibravatar Junio C Hamano2-13/+78
2008-10-18Update draft release notes for 1.6.1Libravatar Junio C Hamano1-1/+6
2008-10-18Merge branch 'maint'Libravatar Junio C Hamano4-10/+23
2008-10-18Hopefully the final draft release notes update before 1.6.0.3Libravatar Junio C Hamano1-1/+9
2008-10-18diff(1): clarify what "T"ypechange status meansLibravatar Junio C Hamano1-1/+2
2008-10-18Merge branch 'db/maint-checkout-b' into maintLibravatar Junio C Hamano2-0/+22
2008-10-18diff: add filter for converting binary to textLibravatar Jeff King3-2/+50
2008-10-18diff: introduce diff.<driver>.binaryLibravatar Jeff King4-38/+45
2008-10-18diff: unify external diff and funcname parsing codeLibravatar Jeff King4-224/+212
2008-10-18t4012: use test_cmp instead of cmpLibravatar Jeff King1-2/+2
2008-10-18format-patch: autonumber by defaultLibravatar Brian Gernhardt15-32/+298
2008-10-18Do not rename read-only files during a pushLibravatar Petr Baudis1-2/+3
2008-10-18Merge branch 'pb/commit-where'Libravatar Junio C Hamano2-8/+22
2008-10-18make alloc_ref_from_str() the new alloc_ref()Libravatar René Scharfe7-27/+18
2008-10-18use alloc_ref_from_str() everywhereLibravatar René Scharfe3-8/+4
2008-10-18add alloc_ref_with_prefix()Libravatar René Scharfe1-16/+16
2008-10-18contrib: update packinfo.pl to not use dashed commandsLibravatar Dan McGee1-7/+7
2008-10-18force_object_loose: Fix memory leakLibravatar Björn Steinbrink1-1/+5
2008-10-18gitk: Regenerate .po filesLibravatar Paul Mackerras5-966/+1037
2008-10-17Fix "checkout --track -b newbranch" on detached HEADLibravatar Junio C Hamano2-7/+11
2008-10-17Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-otherLibravatar Junio C Hamano5-44/+39
2008-10-17refactor handling of "other" files in ls-files and statusLibravatar Jeff King5-44/+40
2008-10-17describe: Make --tags and --all match lightweight tags more oftenLibravatar Shawn O. Pearce3-10/+13
2008-10-17tests: shell negation portability fixLibravatar Jeff King1-1/+1
2008-10-17pull: allow "git pull origin $something:$current_branch" into an unborn branchLibravatar Junio C Hamano2-2/+14
2008-10-17gitk: New way of constructing menus that allows for Alt+letter acceleratorsLibravatar Paul Mackerras1-70/+98
2008-10-17Merge branch 'maint'Libravatar Junio C Hamano7-6/+101
2008-10-16t1301-shared-repo.sh: don't let a default ACL interfere with the testLibravatar Matt McCutchen1-0/+3
2008-10-16rebase--interactive: fix parent rewriting for dropped commitsLibravatar Stephen Haberman2-2/+174
2008-10-16git-check-attr(1): use 'verse' for multi-line synopsis sectionsLibravatar Jonas Fonseca1-1/+2
2008-10-16git-check-attr(1): add output and example sectionsLibravatar Jonas Fonseca1-0/+50
2008-10-16xdiff-interface.c: strip newline (and cr) from line before pattern matchingLibravatar Brandon Casey2-2/+12
2008-10-16t4018-diff-funcname: demonstrate end of line funcname matching flawLibravatar Brandon Casey1-0/+6
2008-10-16t4018-diff-funcname: rework negated last expression testLibravatar Brandon Casey1-1/+2
2008-10-16Typo "does not exists" when git remote update remote.Libravatar Mikael Magnusson1-1/+1
2008-10-16gitk: Bind Key-Return to create on new branch dialogLibravatar Richard Quirk1-0/+1
2008-10-16gitk: Fix binding for <Return> in sha1 entry fieldLibravatar Paul Mackerras1-1/+1
2008-10-15gitk: Clean up file encoding code and add enable/disable optionLibravatar Paul Mackerras1-59/+92
2008-10-14remote.c: correct the check for a leading '/' in a remote nameLibravatar Brandon Casey1-4/+5
2008-10-14Add testcase to ensure merging an early part of a branch is done properlyLibravatar Miklos Vajna1-0/+26
2008-10-14rebase: Document --no-verify option to bypass pre-rebase hookLibravatar Nanako Shiraishi1-1/+4