summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/track'Junio C Hamano2009-05-232-2/+16
|\
| * Fix behavior with non-commit upstream referencesMichael J Gruber2009-05-142-3/+3
| * Test tracking of non-commit upstreamsMichael J Gruber2009-05-131-0/+14
* | Merge branch 'fc/decorate-tag'Junio C Hamano2009-05-237-11/+11
|\ \
| * | Prettify log decorations even moreFelipe Contreras2009-05-132-3/+4
| * | Change prettify_ref to prettify_refnameFelipe Contreras2009-05-135-8/+7
* | | Merge branch 'tp/send-email-from-config'Junio C Hamano2009-05-232-3/+7
|\ \ \
| * | | send-email: Add config option for sender addressTrent Piepho2009-05-132-3/+7
| |/ /
* | | Merge branch 'js/maint-no-ln-across-libexec-and-bin'Junio C Hamano2009-05-231-0/+4
|\ \ \
| * | | Add NO_CROSS_DIRECTORY_HARDLINKS support to the MakefileJohannes Schindelin2009-05-131-0/+4
| | |/ | |/|
* | | Merge branch 'da/mergetool-lib'Junio C Hamano2009-05-231-3/+3
|\ \ \
| * | | mergetool--lib: specialize diff options for emerge and ecmergeDavid Aguilar2009-05-091-3/+3
| | |/ | |/|
* | | Merge branch 'cc/bisect' (early part)Junio C Hamano2009-05-239-271/+494
|\ \ \
| * | | bisect: make "git bisect" use new "--next-all" bisect-helper functionChristian Couder2009-05-104-134/+13
| * | | bisect: add "check_good_are_ancestors_of_bad" functionChristian Couder2009-05-101-0/+75
| * | | bisect: implement the "check_merge_bases" functionChristian Couder2009-05-101-0/+130
| * | | bisect: automatically sort sha1_array if needed when looking it upChristian Couder2009-05-101-2/+6
| * | | bisect: make skipped array functions more genericChristian Couder2009-05-101-12/+12
| * | | bisect: remove too much function nestingChristian Couder2009-05-101-10/+8
| * | | bisect: use new "struct argv_array" to prepare argv for "setup_revisions"Christian Couder2009-05-101-28/+29
| * | | bisect: store good revisions in a "sha1_array"Christian Couder2009-05-101-7/+19
| * | | bisect: implement "rev_argv_push" to fill an argv with revsChristian Couder2009-05-101-8/+11
| * | | bisect: use "sha1_array" to store skipped revisionsChristian Couder2009-05-101-10/+15
| * | | am: simplify "sq" function by using "git rev-parse --sq-quote"Christian Couder2009-05-101-5/+1
| * | | bisect: use "git rev-parse --sq-quote" instead of a custom "sq" functionChristian Couder2009-05-102-14/+3
| * | | rev-parse: add --sq-quote to shell quote argumentsChristian Couder2009-05-102-1/+49
| * | | rev-list: remove stringed output flag from "show_bisect_vars"Christian Couder2009-05-102-18/+15
| * | | bisect--helper: remove "--next-vars" option as it is now uselessChristian Couder2009-05-103-25/+3
| * | | bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"Christian Couder2009-05-101-30/+9
| * | | bisect--helper: add "--next-exit" to output bisect resultsChristian Couder2009-05-103-3/+115
| * | | bisect: move common bisect functionality to "bisect_common"Christian Couder2009-05-101-9/+15
| * | | rev-list: refactor printing bisect varsChristian Couder2009-05-102-28/+37
| * | | rev-list: make "estimate_bisect_steps" non staticChristian Couder2009-05-102-1/+3
| |/ /
* | | Merge branch 'lt/maint-diff-reduce-lstat'Junio C Hamano2009-05-232-3/+3
|\ \ \
| * | | Teach 'git checkout' to preload the index contentsLinus Torvalds2009-05-091-2/+2
| * | | Avoid unnecessary 'lstat()' calls in 'get_stat_data()'Linus Torvalds2009-05-091-1/+1
* | | | Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'Junio C Hamano2009-05-232-1/+20
|\ \ \ \
| * | | | format-patch let -k override a config-specified format.numberedJim Meyering2009-05-092-1/+20
| | |/ / | |/| |
* | | | Merge branch 'do/maint-merge-recursive-fix'Junio C Hamano2009-05-232-5/+101
|\ \ \ \
| * | | | merge-recursive: never leave index unmerged while recursingDave Olszewski2009-05-092-5/+101
* | | | | Merge branch 'rr/forbid-bs-in-ref'Junio C Hamano2009-05-232-1/+4
|\ \ \ \ \
| * | | | | Disallow '\' in ref namesRobin Rosenberg2009-05-092-1/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'hv/sample-update'Junio C Hamano2009-05-231-0/+10
|\ \ \ \ \
| * | | | | Extend sample update hook, disable modifying of existing tagsHeiko Voigt2009-05-091-0/+10
* | | | | | Merge branch 'jk/maint-1.6.0-trace-argv'Junio C Hamano2009-05-231-4/+4
|\ \ \ \ \ \
| * | | | | | fix GIT_TRACE segfault with shell-quoted aliasesJeff King2009-05-091-4/+4
* | | | | | | Merge branch 'jk/no-no-no-empty-directory'Junio C Hamano2009-05-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | parseopt: add OPT_NEGBITJeff King2009-05-091-1/+1
* | | | | | | | Merge branch 'rs/grep-parseopt'Junio C Hamano2009-05-237-252/+350
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: make callback functions staticRené Scharfe2009-05-201-8/+10