summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ae/preservemerge'Junio C Hamano2008-10-193-5/+81
|\
| * rebase: Support preserving merges in non-interactive modeAndreas Ericsson2008-09-303-5/+81
* | Merge branch 'mv/merge-noff'Junio C Hamano2008-10-194-1/+40
|\ \
| * | builtin-commit: use reduce_heads() only when appropriateMiklos Vajna2008-10-034-2/+41
* | | Merge branch 'ns/rebase-noverify'Junio C Hamano2008-10-194-3/+35
|\ \ \
| * | | rebase: Document --no-verify option to bypass pre-rebase hookNanako Shiraishi2008-10-141-1/+4
| * | | rebase --no-verifyNanako Shiraishi2008-10-063-2/+31
* | | | Merge branch 'maint'Junio C Hamano2008-10-191-1/+2
|\ \ \ \
| * | | | Documentation: Clarify '--signoff' for git-commitAbhijit Bhopatkar2008-10-181-1/+2
* | | | | Fix mismerge at cdb22c4 in builtin-checkout.cJunio C Hamano2008-10-191-3/+0
* | | | | git-merge-recursive: honor merge.conflictstyle once againMatt McCutchen2008-10-191-1/+1
* | | | | Documentation: Spelling fixFredrik Skolmli2008-10-191-1/+1
* | | | | Merge branch 'pb/rename-rowin32'Junio C Hamano2008-10-191-2/+3
|\ \ \ \ \
| * | | | | Do not rename read-only files during a pushPetr Baudis2008-10-181-2/+3
* | | | | | Update draft release notes for 1.6.1Junio C Hamano2008-10-181-1/+6
* | | | | | Merge branch 'maint'Junio C Hamano2008-10-184-10/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Hopefully the final draft release notes update before 1.6.0.3Junio C Hamano2008-10-181-1/+9
| * | | | | diff(1): clarify what "T"ypechange status meansJunio C Hamano2008-10-181-1/+2
| * | | | | Merge branch 'db/maint-checkout-b' into maintJunio C Hamano2008-10-182-0/+22
| |\ \ \ \ \
| * | | | | | contrib: update packinfo.pl to not use dashed commandsDan McGee2008-10-181-7/+7
| * | | | | | force_object_loose: Fix memory leakBjörn Steinbrink2008-10-181-1/+5
| * | | | | | tests: shell negation portability fixJeff King2008-10-171-1/+1
* | | | | | | Merge branch 'pb/commit-where'Junio C Hamano2008-10-182-8/+22
|\ \ \ \ \ \ \
| * | | | | | | tutorial: update output of git commitJeff King2008-10-061-2/+4
| * | | | | | | reformat informational commit messageJeff King2008-10-021-27/+10
| * | | | | | | git commit: Reformat output somewhatAndreas Ericsson2008-09-302-12/+13
| * | | | | | | builtin-commit.c: show on which branch a commit was addedPieter de Bie2008-09-071-2/+30
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-10-177-6/+101
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | t1301-shared-repo.sh: don't let a default ACL interfere with the testMatt McCutchen2008-10-161-0/+3
| * | | | | | | git-check-attr(1): add output and example sectionsJonas Fonseca2008-10-161-0/+50
| * | | | | | | xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey2008-10-162-2/+12
| * | | | | | | t4018-diff-funcname: demonstrate end of line funcname matching flawBrandon Casey2008-10-161-0/+6
| * | | | | | | t4018-diff-funcname: rework negated last expression testBrandon Casey2008-10-161-1/+2
| * | | | | | | Typo "does not exists" when git remote update remote.Mikael Magnusson2008-10-161-1/+1
| * | | | | | | remote.c: correct the check for a leading '/' in a remote nameBrandon Casey2008-10-141-4/+5
| * | | | | | | Add testcase to ensure merging an early part of a branch is done properlyMiklos Vajna2008-10-141-0/+26
* | | | | | | | Add Linux PPC support to the pre-auto-gc example hookMiklos Vajna2008-10-141-0/+3
* | | | | | | | t4018-diff-funcname: add objective-c xfuncname pattern to syntax testBrandon Casey2008-10-141-1/+1
* | | | | | | | Update draft release notes to 1.6.1Junio C Hamano2008-10-131-7/+46
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-10-131-2/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Update draft release notes to 1.6.0.3Junio C Hamano2008-10-131-2/+19
* | | | | | | | tests: shell negation portability fixJeff King2008-10-131-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'maint'Shawn O. Pearce2008-10-123-1/+60
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | test-lib: fix broken printfShawn O. Pearce2008-10-121-1/+1
| * | | | | | git apply --directory broken for new filesJeff King2008-10-122-0/+59
* | | | | | | "git diff <tree>{3,}": do not reverse order of argumentsMatt McCutchen2008-10-123-3/+31
* | | | | | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-1246-197/+91
* | | | | | | print an error message for invalid pathDmitry Potapov2008-10-122-3/+5
* | | | | | | Documentation: remove stale howto/rebase-and-edit.txtThomas Rast2008-10-121-79/+0
* | | | | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey2008-10-121-1/+1
View Lorry Controller Status