summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-04-172-74/+91
|\
| * git-gui: Honor TCLTK_PATH if suppliedJunio C Hamano2007-04-171-0/+4
| * Revert "Allow wish interpreter to be defined with TCLTK_PATH"Shawn O. Pearce2007-04-171-3/+0
| * git-gui: Display the directory basename in the titleShawn O. Pearce2007-04-151-1/+1
| * Merge branch 'er/ui'Shawn O. Pearce2007-04-152-69/+83
| |\
| | * Always bind the return key to the default buttonShawn O. Pearce2007-04-041-0/+2
| | * Do not break git-gui messages into multiple lines.Eygene Ryabinkin2007-04-041-46/+18
| | * Improve look-and-feel of the git-gui tool.Eygene Ryabinkin2007-04-041-4/+15
| | * Teach git-gui to use the user-defined UI font everywhere.Eygene Ryabinkin2007-04-041-19/+45
| | * Allow wish interpreter to be defined with TCLTK_PATHEygene Ryabinkin2007-04-041-0/+3
| * | git-gui: Brown paper bag fix division by 0 in blameShawn O. Pearce2007-04-041-4/+6
| |/
* | Merge branch 'jc/read-tree-df'Junio C Hamano2007-04-174-24/+587
|\ \
| * | t3030: merge-recursive backend test.Junio C Hamano2007-04-101-0/+528
| * | merge-recursive: handle D/F conflict case more carefully.Junio C Hamano2007-04-101-3/+26
| * | merge-recursive: do not barf on "to be removed" entries.Junio C Hamano2007-04-101-5/+11
| * | Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()Junio C Hamano2007-04-101-14/+20
| * | t1000: fix case table.Junio C Hamano2007-04-102-2/+2
* | | Add --ignore-unmatch option to exit with zero status when no files are removed.Steven Grimm2007-04-173-5/+25
* | | Bisect: rename "t/t6030-bisect-run.sh" to "t/t6030-bisect-porcelain.sh".Christian Couder2007-04-161-1/+1
* | | Bisect: simplify "bisect start" logging.Christian Couder2007-04-161-4/+1
* | | Merge branch 'js/wrap-log'Junio C Hamano2007-04-168-3/+120
|\ \ \
| * | | Fix permissions on test scriptsAlex Riesen2007-04-167-0/+0
| * | | Fix t4201: accidental arithmetic expansionAlex Riesen2007-04-161-1/+1
| * | | shortlog -w: make wrap-line behaviour optional.Junio C Hamano2007-04-102-5/+67
| * | | Use print_wrapped_text() in shortlogJohannes Schindelin2007-04-102-3/+58
| |/ /
* | | send-email: do not leave an empty CC: line if no cc is present.Junio C Hamano2007-04-161-2/+5
* | | Add support for "commit name decorations" to log family of commandsLinus Torvalds2007-04-163-2/+61
* | | Add a generic "object decorator" interface, and make object refs use itLinus Torvalds2007-04-165-65/+116
* | | Merge branch 'maint'Junio C Hamano2007-04-1611-137/+222
|\ \ \
| * | | Have sample update hook not refuse deleting a branch through push.Gerrit Pape2007-04-161-1/+6
| * | | variable $projectdesc needs to be set before checking against unchanged default.Gerrit Pape2007-04-161-0/+1
| * | | Update git-annotate/git-blame documentationAndrew Ruder2007-04-164-67/+85
| * | | Update git-apply documentationAndrew Ruder2007-04-161-6/+7
| * | | Update git-applymbox documentationAndrew Ruder2007-04-161-4/+10
| * | | Update git-am documentationAndrew Ruder2007-04-161-9/+16
| * | | user-manual: use detached head when rewriting historyJ. Bruce Fields2007-04-161-7/+8
| * | | user-manual: start revising "internals" chapterJ. Bruce Fields2007-04-161-18/+20
| * | | user-manual: detached HEADJ. Bruce Fields2007-04-161-2/+42
| * | | user-manual: fix discussion of default cloneJ. Bruce Fields2007-04-161-3/+3
| * | | Documentation: clarify track/no-track option.J. Bruce Fields2007-04-161-4/+8
| * | | Documentation: clarify git-checkout -f, minor editingJ. Bruce Fields2007-04-161-4/+5
| * | | Documentation: minor edits of git-lost-found manpageJ. Bruce Fields2007-04-161-12/+11
* | | | git-rm: Trivial fix for a comment typo.Steven Grimm2007-04-161-1/+1
* | | | Add --quiet option to suppress output of "rm" commands for removed files.Steven Grimm2007-04-163-3/+34
* | | | Display the subject of the commit just made.Michael S. Tsirkin2007-04-161-1/+2
* | | | Add policy on user-interface changesAndrew Ruder2007-04-151-0/+3
* | | | Merge branch 'maint'Junio C Hamano2007-04-153-15/+44
|\ \ \ \ | |/ / /
| * | | Document -g (--walk-reflogs) option of git-logAlex Riesen2007-04-151-0/+5
| * | | sscanf/strtoul: parse integers robustlyJim Meyering2007-04-144-18/+22
| * | | Merge git://git2.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano2007-04-141-14/+38
| |\ \ \
View Lorry Controller Status