summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* factorize revindex code out of builtin-pack-objects.cNicolas Pitre2008-03-014-152/+167
* Merge branch 'maint'Junio C Hamano2008-02-273-3/+8
|\
| * Eliminate confusing "won't bisect on seeked tree" failureCarl Worth2008-02-272-6/+10
| * builtin-reflog.c: don't install new reflog on write failureBrandon Casey2008-02-271-2/+3
| * send-email: fix In-Reply-To regressionJay Soffian2008-02-272-3/+27
| * Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIRJohan Herland2008-02-272-7/+6
| * Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIRJohan Herland2008-02-271-1/+17
| * Prompt to continue when editing during rebase --interactiveJonathan del Strother2008-02-271-0/+4
| * Documentation/git svn log: add a note about timezones.Miklos Vajna2008-02-271-0/+4
| * Merge branch 'js/maint-http-push' into maintJunio C Hamano2008-02-271-9/+18
| |\
| * | Don't use GIT_CONFIG in t5505-remoteDaniel Barkalow2008-02-271-3/+0
* | | Merge branch 'git-p4' of git://repo.or.cz/git/git-p4Junio C Hamano2008-02-271-118/+98
|\ \ \
| * | | git-p4: Support usage of perforce client specTor Arvid Lund2008-02-271-8/+42
| * | | git-p4: git-p4 submit cleanups.Simon Hausmann2008-02-271-41/+10
| * | | git-p4: Removed git-p4 submit --direct.Simon Hausmann2008-02-271-45/+11
| * | | git-p4: Clean up git-p4 submit's log message handling.Simon Hausmann2008-02-271-16/+16
| * | | git-p4: Remove --log-substitutions feature.Simon Hausmann2008-02-271-7/+0
| * | | git-p4: support exclude pathsTommy Thorn2008-02-271-4/+22
* | | | git-svn: Don't prompt for client cert password everytime.Sebastian Noack2008-02-271-0/+1
* | | | git.el: Do not display empty directories.Alexandre Julliard2008-02-271-1/+1
* | | | Merge branch 'jm/free'Junio C Hamano2008-02-2717-53/+27
|\ \ \ \
| * | | | Avoid unnecessary "if-before-free" tests.Jim Meyering2008-02-2217-55/+28
* | | | | Merge branch 'js/branch-track'Junio C Hamano2008-02-2712-73/+131
|\ \ \ \ \
| * | | | | doc: documentation update for the branch track changesJay Soffian2008-02-193-32/+34
| * | | | | branch: optionally setup branch.*.merge from upstream local branchesJay Soffian2008-02-199-39/+98
* | | | | | Merge branch 'db/checkout'Junio C Hamano2008-02-2720-271/+1002
|\ \ \ \ \ \
| * | | | | | checkout: error out when index is unmerged even with -mJunio C Hamano2008-02-241-17/+18
| * | | | | | checkout: show progress when checkout takes long time while switching branchesJunio C Hamano2008-02-231-0/+1
| * | | | | | Add merge-subtree backJunio C Hamano2008-02-233-5/+36
| * | | | | | checkout: updates to tracking reportJunio C Hamano2008-02-211-5/+5
| * | | | | | builtin-checkout.c: Remove unused prefix arguments in switch_branches pathDaniel Barkalow2008-02-211-6/+4
| * | | | | | checkout: work from a subdirectoryJunio C Hamano2008-02-202-1/+34
| * | | | | | checkout: tone down the "forked status" diagnostic messagesJunio C Hamano2008-02-201-40/+64
| |/ / / / /
| * | | | | Clean up reporting differences on branch switchDaniel Barkalow2008-02-191-71/+7
| * | | | | builtin-checkout.c: fix possible usage segfaultJay Soffian2008-02-181-0/+1
| * | | | | checkout: notice when the switched branch is behind or forkedJunio C Hamano2008-02-161-0/+136
| * | | | | Build in checkoutDaniel Barkalow2008-02-166-8/+481
| * | | | | Move code to clean up after a branch change to branch.cDaniel Barkalow2008-02-093-6/+28
| * | | | | Library function to check for unmerged index entriesDaniel Barkalow2008-02-094-26/+15
| * | | | | Use diff -u instead of diff in t7201Daniel Barkalow2008-02-091-9/+9
| * | | | | Move create_branch into a library fileDaniel Barkalow2008-02-094-137/+151
| * | | | | Build-in merge-recursiveDaniel Barkalow2008-02-095-22/+46
| * | | | | Add "skip_unmerged" option to unpack_trees.Daniel Barkalow2008-02-092-3/+18
| * | | | | Discard "deleted" cache entries after using them to update the working treeDaniel Barkalow2008-02-091-7/+9
| * | | | | Send unpack-trees debugging output to stderrDaniel Barkalow2008-02-091-7/+7
| * | | | | Add flag to make unpack_trees() not print errors.Daniel Barkalow2008-02-092-14/+30
| * | | | | Allow callers of unpack_trees() to handle failureDaniel Barkalow2008-02-094-41/+56
* | | | | | Merge branch 'db/cover-letter'Junio C Hamano2008-02-2712-234/+699
|\ \ \ \ \ \
| * | | | | | Improve collection of information for format-patch --cover-letterDaniel Barkalow2008-02-251-24/+28
| * | | | | | Add API access to shortlogDaniel Barkalow2008-02-252-68/+106