summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | t4014: Replace sed's non-standard 'Q' by standard 'q'Steffen Prohaska2008-02-231-4/+4
| * | | Support a --cc=<email> option in format-patchDaniel Barkalow2008-02-193-0/+17
| * | | Combine To: and Cc: headersDaniel Barkalow2008-02-192-15/+65
| * | | Fix format.headers not ending with a newlineDaniel Barkalow2008-02-192-3/+7
| * | | Add tests for extra headers in format-patchDaniel Barkalow2008-02-191-0/+34
| * | | Add a --cover-letter option to format-patchDaniel Barkalow2008-02-195-65/+314
| * | | Export some email and pretty-printing functionsDaniel Barkalow2008-02-194-75/+102
| * | | Improve message-id generation flow control for format-patchDaniel Barkalow2008-02-192-16/+15
| * | | Add more tests for format-patchDaniel Barkalow2008-02-191-0/+45
* | | | Merge branch 'js/merge'Junio C Hamano2008-02-274-2/+91
|\ \ \ \
| * | | | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-184-5/+39
| * | | | xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin2008-02-182-1/+56
| |/ / /
* | | | Merge branch 'cw/bisect'Junio C Hamano2008-02-272-6/+10
|\ \ \ \
| * | | | Eliminate confusing "won't bisect on seeked tree" failureCarl Worth2008-02-242-6/+10
* | | | | Merge branch 'jk/help-alias'Junio C Hamano2008-02-275-78/+118
|\ \ \ \ \
| * | | | | help: respect aliasesJeff King2008-02-241-1/+32
| * | | | | make alias lookup a public, procedural functionJeff King2008-02-244-15/+29
| * | | | | help: use parseoptJeff King2008-02-241-64/+59
| |/ / / /
* | | | | Merge branch 'js/run-command'Junio C Hamano2008-02-278-22/+58
|\ \ \ \ \
| * | | | | start_command(), if .in/.out > 0, closes file descriptors, not the callersJohannes Sixt2008-02-235-11/+49
View Lorry Controller Status