aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2010-12-14
|\
| * gitk: Add Brazilian Portuguese (pt-BR) translationAlexandre Erwin Ittner2010-12-14
| * gitk: Make text selectable on MacStefan Haller2010-12-12
| * gitk: Prevent the text pane from becoming editableStefan Haller2010-12-12
| * gitk: Add the equivalent of diff --color-wordsThomas Rast2010-12-12
| * gitk: Update Swedish translation (290t)Peter Krefting2010-12-12
| * gitk: Show notes by default (like git log does)Kirill Smelkov2010-05-30
* | Merge branch 'maint'Junio C Hamano2010-12-14
|\ \
| * | Prepare for 1.7.3.4Junio C Hamano2010-12-14
| * | use persistent memory for rejected pathsClemens Buchacher2010-12-14
| * | do not overwrite files in leading pathClemens Buchacher2010-12-14
| * | lstat_cache: optionally return match_lenClemens Buchacher2010-12-14
| * | add function check_ok_to_remove()Clemens Buchacher2010-12-14
| * | t7607: add leading-path testsClemens Buchacher2010-12-14
| * | t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-12-14
| * | Merge branch 'jc/maint-no-openssl-build-fix' into maintJunio C Hamano2010-12-14
| |\ \
| | * | Do not link with -lcrypto under NO_OPENSSLJunio C Hamano2010-12-08
| * | | Merge branch 'ja/maint-pull-rebase-doc' into maintJunio C Hamano2010-12-14
| |\ \ \
| * \ \ \ Merge branch 'tc/http-urls-ends-with-slash' into maintJunio C Hamano2010-12-14
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/maint-hide-checkout-index-from-error' into maintJunio C Hamano2010-12-14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/maint-reflog-bottom' into maintJunio C Hamano2010-12-14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mz/rebase-abort-reflog-fix' into maintJunio C Hamano2010-12-14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mz/maint-rebase-stat-config' into maintJunio C Hamano2010-12-14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'gc/http-with-non-ascii-username-url' into maintJunio C Hamano2010-12-14
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | t800?-blame.sh: retitle uniquelyMichael J Gruber2010-12-13
* | | | | | | | | | | tests: flip executable bit on t9158Jeff King2010-12-13
* | | | | | | | | | | tests: add some script lint checksJeff King2010-12-13
* | | | | | | | | | | Avoid duplicate test number t7609Johannes Sixt2010-12-13
* | | | | | | | | | | Merge branch 'ja/maint-pull-rebase-doc'Junio C Hamano2010-12-12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | git-pull.txt: Mention branch.autosetuprebaseJari Aalto2010-12-03
* | | | | | | | | | | Merge branch 'gb/web--browse'Junio C Hamano2010-12-12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | web--browse: better support for chromiumGiuseppe Bilotta2010-12-03
| * | | | | | | | | | | web--browse: support opera, seamonkey and elinksGiuseppe Bilotta2010-12-03
| * | | | | | | | | | | web--browse: split valid_tool listGiuseppe Bilotta2010-12-03
| * | | | | | | | | | | web--browse: coding styleGiuseppe Bilotta2010-12-03
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jn/parse-options-extra'Junio C Hamano2010-12-12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update-index: migrate to parse-options APIJonathan Nieder2010-12-07
| * | | | | | | | | | | setup: save prefix (original cwd relative to toplevel) in startup_infoNguyễn Thái Ngọc Duy2010-12-07
| * | | | | | | | | | | parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTIONJonathan Nieder2010-12-07
| * | | | | | | | | | | parse-options: allow git commands to invent new option typesJonathan Nieder2010-12-07
| * | | | | | | | | | | parse-options: never suppress arghelp if LITERAL_ARGHELP is setJonathan Nieder2010-12-07
| * | | | | | | | | | | parse-options: do not infer PARSE_OPT_NOARG from option typeStephen Boyd2010-12-07
| * | | | | | | | | | | parse-options: sanity check PARSE_OPT_NOARG flagJonathan Nieder2010-12-07
| * | | | | | | | | | | parse-options: move NODASH sanity checks to parse_options_checkJonathan Nieder2010-12-07
| * | | | | | | | | | | parse-options: clearer reporting of API misuseJonathan Nieder2010-12-07
| * | | | | | | | | | | parse-options: Don't call parse_options_check() so muchStephen Boyd2010-12-06
* | | | | | | | | | | | Merge branch 'js/configurable-tab'Junio C Hamano2010-12-12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make the tab width used for whitespace checks configurableJohannes Sixt2010-12-01
| * | | | | | | | | | | | Merge branch 'js/maint-apply-tab-in-indent-fix' into HEADJunio C Hamano2010-12-01
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | apply --whitespace=fix: fix tab-in-indentJohannes Sixt2010-12-01