summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'sh/maint-rebase3'Junio C Hamano2008-10-202-2/+174
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase--interactive: fix parent rewriting for dropped commitsStephen Haberman2008-10-162-2/+174
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'tr/workflow-doc'Junio C Hamano2008-10-206-8/+500
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: add manpage about workflowsThomas Rast2008-10-192-1/+365
| * | | | | | | | Documentation: Refer to git-rebase(1) to warn against rewritingThomas Rast2008-09-163-2/+10
| * | | | | | | | Documentation: new upstream rebase recovery section in git-rebaseThomas Rast2008-09-161-5/+125
* | | | | | | | | Merge branch 'mv/clonev'Junio C Hamano2008-10-205-1/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Implement git clone -vMiklos Vajna2008-10-095-1/+25
* | | | | | | | | | Merge branch 'ml/cygwin-filemode'Junio C Hamano2008-10-202-5/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | compat/cygwin.c - Use cygwin's stat if core.filemode == trueMark Levedahl2008-10-132-5/+17
* | | | | | | | | | | Merge branch 'gb/refactor-pathinfo'Junio C Hamano2008-10-201-137/+178
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: refactor input parameters parse/validationGiuseppe Bilotta2008-10-121-137/+178
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'dp/checkattr'Junio C Hamano2008-10-203-25/+110
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-check-attr(1): use 'verse' for multi-line synopsis sectionsJonas Fonseca2008-10-161-1/+2
| * | | | | | | | | | | check-attr: Add --stdin optionDmitry Potapov2008-10-123-11/+89
| * | | | | | | | | | | check-attr: add an internal check_attr() functionDmitry Potapov2008-10-121-18/+24
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'gb/formatpatch-autonbr'Junio C Hamano2008-10-2015-32/+298
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | format-patch: autonumber by defaultBrian Gernhardt2008-10-1815-32/+298
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'sp/describe-lwtag'Junio C Hamano2008-10-203-10/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | describe: Make --tags and --all match lightweight tags more oftenShawn O. Pearce2008-10-173-10/+13
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ae/preservemerge'Junio C Hamano2008-10-203-5/+81
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase: Support preserving merges in non-interactive modeAndreas Ericsson2008-10-013-5/+81
* | | | | | | | | | | | Merge branch 'mv/merge-noff'Junio C Hamano2008-10-204-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin-commit: use reduce_heads() only when appropriateMiklos Vajna2008-10-034-2/+41
* | | | | | | | | | | | | Merge branch 'ns/rebase-noverify'Junio C Hamano2008-10-204-3/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase: Document --no-verify option to bypass pre-rebase hookNanako Shiraishi2008-10-151-1/+4
| * | | | | | | | | | | | | rebase --no-verifyNanako Shiraishi2008-10-063-2/+31
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-10-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Documentation: Clarify '--signoff' for git-commitAbhijit Bhopatkar2008-10-191-1/+2
* | | | | | | | | | | | | | Fix mismerge at cdb22c4 in builtin-checkout.cJunio C Hamano2008-10-201-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-031-27/+10
| * | | | | | | | | | | | git commit: Reformat output somewhatAndreas Ericsson2008-10-012-12/+13
| * | | | | | | | | | | | builtin-commit.c: show on which branch a commit was addedPieter de Bie2008-09-081-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-171-0/+3
| * | | | | | | | | | | | git-check-attr(1): add output and example sectionsJonas Fonseca2008-10-161-0/+50