summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sync with 1.7.3.4Junio C Hamano2010-12-159-18/+114
|\
| * Git 1.7.3.4v1.7.3.4Junio C Hamano2010-12-159-18/+113
| |\
| | * Git 1.7.2.5v1.7.2.5Junio C Hamano2010-12-159-19/+111
| | |\
| | | * Git 1.7.1.4v1.7.1.4Junio C Hamano2010-12-158-19/+104
| | | |\
| | | | * Git 1.7.0.9v1.7.0.9Junio C Hamano2010-12-157-19/+96
| | | | |\
| | | | | * Git 1.6.6.3v1.6.6.3Junio C Hamano2010-12-156-19/+88
| | | | | |\
| | | | | | * Git 1.6.5.9v1.6.5.9Junio C Hamano2010-12-155-18/+64
| | | | | | |\
| | | | | | | * Git 1.6.4.5v1.6.4.5Junio C Hamano2010-12-153-2/+22
| | | | | | | * gitweb: Introduce esc_attr to escape attributes of HTML elementsJakub Narebski2010-12-151-15/+22
* | | | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2010-12-143-305/+1654
|\ \ \ \ \ \ \ \
| * | | | | | | | gitk: Add Brazilian Portuguese (pt-BR) translationAlexandre Erwin Ittner2010-12-141-0/+1277
| * | | | | | | | gitk: Make text selectable on MacStefan Haller2010-12-121-0/+1
| * | | | | | | | gitk: Prevent the text pane from becoming editableStefan Haller2010-12-121-0/+1
| * | | | | | | | gitk: Add the equivalent of diff --color-wordsThomas Rast2010-12-121-3/+61
| * | | | | | | | gitk: Update Swedish translation (290t)Peter Krefting2010-12-121-298/+303
| * | | | | | | | gitk: Show notes by default (like git log does)Kirill Smelkov2010-05-301-4/+11
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-12-143-5/+14
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Prepare for 1.7.3.4Junio C Hamano2010-12-141-0/+10
| * | | | | | | | use persistent memory for rejected pathsClemens Buchacher2010-12-144-42/+38
| * | | | | | | | do not overwrite files in leading pathClemens Buchacher2010-12-144-10/+31
| * | | | | | | | lstat_cache: optionally return match_lenClemens Buchacher2010-12-141-16/+27
| * | | | | | | | add function check_ok_to_remove()Clemens Buchacher2010-12-141-49/+58
| * | | | | | | | t7607: add leading-path testsClemens Buchacher2010-12-141-0/+51
| * | | | | | | | t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-12-141-23/+15
| * | | | | | | | Merge branch 'jc/maint-no-openssl-build-fix' into maintJunio C Hamano2010-12-141-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Do not link with -lcrypto under NO_OPENSSLJunio C Hamano2010-12-081-0/+4
| * | | | | | | | | Merge branch 'ja/maint-pull-rebase-doc' into maintJunio C Hamano2010-12-141-2/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tc/http-urls-ends-with-slash' into maintJunio C Hamano2010-12-149-40/+55
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-hide-checkout-index-from-error' into maintJunio C Hamano2010-12-141-8/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-reflog-bottom' into maintJunio C Hamano2010-12-143-2/+37
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/rebase-abort-reflog-fix' into maintJunio C Hamano2010-12-142-9/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/maint-rebase-stat-config' into maintJunio C Hamano2010-12-141-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gc/http-with-non-ascii-username-url' into maintJunio C Hamano2010-12-145-1/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | t800?-blame.sh: retitle uniquelyMichael J Gruber2010-12-132-0/+0
* | | | | | | | | | | | | | | | | tests: flip executable bit on t9158Jeff King2010-12-131-0/+0
* | | | | | | | | | | | | | | | | tests: add some script lint checksJeff King2010-12-131-2/+14
* | | | | | | | | | | | | | | | | Avoid duplicate test number t7609Johannes Sixt2010-12-131-0/+0
* | | | | | | | | | | | | | | | | Merge branch 'ja/maint-pull-rebase-doc'Junio C Hamano2010-12-121-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | git-pull.txt: Mention branch.autosetuprebaseJari Aalto2010-12-031-2/+3
* | | | | | | | | | | | | | | | | Merge branch 'gb/web--browse'Junio C Hamano2010-12-122-85/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | web--browse: better support for chromiumGiuseppe Bilotta2010-12-032-7/+13
| * | | | | | | | | | | | | | | | | web--browse: support opera, seamonkey and elinksGiuseppe Bilotta2010-12-032-7/+13
| * | | | | | | | | | | | | | | | | web--browse: split valid_tool listGiuseppe Bilotta2010-12-031-1/+2
| * | | | | | | | | | | | | | | | | web--browse: coding styleGiuseppe Bilotta2010-12-031-83/+83
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jn/parse-options-extra'Junio C Hamano2010-12-127-198/+303
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | update-index: migrate to parse-options APIJonathan Nieder2010-12-071-149/+243
| * | | | | | | | | | | | | | | | | setup: save prefix (original cwd relative to toplevel) in startup_infoNguyễn Thái Ngọc Duy2010-12-072-1/+4
| * | | | | | | | | | | | | | | | | parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTIONJonathan Nieder2010-12-072-1/+3
| * | | | | | | | | | | | | | | | | parse-options: allow git commands to invent new option typesJonathan Nieder2010-12-072-1/+10
| * | | | | | | | | | | | | | | | | parse-options: never suppress arghelp if LITERAL_ARGHELP is setJonathan Nieder2010-12-071-1/+2