summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-12-15Git 1.6.4.5v1.6.4.5Junio C Hamano3-2/+22
2010-12-15gitweb: Introduce esc_attr to escape attributes of HTML elementsJakub Narebski1-15/+22
2010-07-25Check size of path buffer before writing into itGreg Brockman1-0/+2
2010-07-07rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-optionUwe Kleine-König2-2/+20
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano8-43/+47
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano8-43/+47
2010-01-18Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano1-1/+5
2010-01-18Fix mis-backport of t7002Junio C Hamano1-1/+5
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano8-43/+47
2010-01-10Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano4-28/+28
2010-01-09base85: Make the code more obvious instead of explaining the non-obviousAndreas Gruenbacher1-8/+2
2010-01-09base85: encode_85() does not use the decode tableAndreas Gruenbacher1-2/+0
2010-01-09base85 debug code: Fix length byte calculationAndreas Gruenbacher1-1/+1
2010-01-06checkout -m: do not try to fall back to --merge from an unborn branchJunio C Hamano1-2/+8
2009-12-31branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2-15/+17
2009-12-30textconv: stop leaking file descriptorsJeff King1-0/+2
2009-12-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-9/+11
2009-12-29commit: --cleanup is a message optionGreg Price1-2/+4
2009-12-29git count-objects: handle packs bigger than 4GAndreas Schwab1-6/+6
2009-12-29t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy1-7/+7
2009-10-27rebase -i: more graceful handling of invalid commandsJan Krüger1-1/+6
2009-10-27help -i: properly error out if no info viewer can be foundGerrit Pape1-0/+1
2009-10-25Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4Junio C Hamano2-8/+32
2009-10-25Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maint-1.6.4Junio C Hamano1-3/+6
2009-10-16grep: do not segfault when -f is usedMatt Kraai2-1/+67
2009-10-12Documentation: describe check-ref-format --branchJonathan Nieder1-3/+6
2009-10-12git-stash documentation: mention default options for 'list'Miklos Vajna1-1/+2
2009-10-12ls-files: excludes should not impact tracked filesJeff King2-8/+32
2009-10-08ls-files: die instead of fprintf/exit in -i errorBen Walton1-5/+2
2009-10-07fast-import.c::validate_raw_date(): really validate the valueJunio C Hamano1-3/+6
2009-10-04Merge branch 'jc/maint-1.6.4-show-branch-default' into maintJunio C Hamano2-3/+19
2009-10-04show-branch: fix segfault when showbranch.default existsJunio C Hamano2-3/+19
2009-09-20push: Correctly initialize nonfastforward in transport_push.Matthieu Moy1-1/+2
2009-09-16GIT 1.6.4.4v1.6.4.4Junio C Hamano4-3/+30
2009-09-16Merge branch 'jc/maint-unpack-objects-strict' into maintJunio C Hamano2-7/+44
2009-09-16Merge branch 'tf/diff-whitespace-incomplete-line' into maintJunio C Hamano1-33/+53
2009-09-16Merge branch 'jk/maint-1.6.3-checkout-unborn' into maintJunio C Hamano2-9/+43
2009-09-16Merge branch 'jc/maint-checkout-index-to-prefix' into maintJunio C Hamano3-5/+18
2009-09-14Merge branch 'rc/maint-http-no-head-pack-check' into maintJunio C Hamano1-1/+1
2009-09-14http.c: avoid freeing an uninitialized pointerJunio C Hamano1-1/+1
2009-09-13GIT 1.6.4.3v1.6.4.3Junio C Hamano4-3/+33
2009-09-13svn: properly escape arguments for authors-progMark Lodato2-0/+15
2009-09-13Merge branch 'cb/maint-1.6.3-grep-relative-up' into maintJunio C Hamano3-27/+30
2009-09-11http.c: remove verification of remote packsTay Ray Chuan1-11/+0
2009-09-07git-pull: do not mention --quiet and --verbose twiceEmmanuel Trillaud1-0/+2
2009-09-07githooks.txt: put hooks into subsectionsBert Wesarg1-15/+18
2009-09-07grep: accept relative paths outside current working directoryClemens Buchacher3-27/+29
2009-09-07grep: fix exit status if external_grep() puntsClemens Buchacher1-0/+1
2009-09-06push: re-flow non-fast-forward messageJeff King1-3/+3
2009-09-06push: fix english in non-fast-forward messageJeff King1-1/+1
2009-09-03Merge branch 'maint-1.6.3' into maintJunio C Hamano4-24/+28
2009-09-03Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano3-4/+8
2009-09-03git-clone: add missing comma in --reference documentationMiklos Vajna1-1/+1
2009-09-02git-cvsserver: no longer use deprecated 'git-subcommand' commandsGerrit Pape1-20/+20
2009-09-02clone: disconnect transport after fetchingJeff King2-3/+7
2009-08-29GIT 1.6.4.2v1.6.4.2Junio C Hamano4-3/+36
2009-08-29Remove unused t/t8005/iso8859-5.txtNanako Shiraishi1-2/+0
2009-08-28Merge branch 'rc/maint-http-fix' into maintJunio C Hamano1-1/+3
2009-08-28http.c: set slot callback members to NULL when releasing objectTay Ray Chuan1-1/+6
2009-08-27Merge branch 'maint-1.6.3' into maintJunio C Hamano4-4/+4
2009-08-27Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano4-4/+4
2009-08-27Fix overridable written with an extra 'e'Nanako Shiraishi2-2/+2
2009-08-27Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano1-1/+1
2009-08-27Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+1
2009-08-27Documentation: git-archive: mark --format as optional in summaryWesley J. Landaker1-1/+1
2009-08-27Merge branch 'maint-1.5.6' into maint-1.6.0Junio C Hamano2-2/+43
2009-08-27Round-down years in "years+months" relative date viewDavid Reiss1-1/+1
2009-08-26git-log: allow --decorate[=short|full]Lars Hjemli9-10/+65
2009-08-26Minor improvement to the write-tree documentationDavid Kågedal1-1/+2
2009-08-26git-bisect: call the found commit "*the* first bad commit"Nanako Shiraishi3-11/+11
2009-08-26Merge branch 'js/maint-cover-letter-non-ascii' into maintJunio C Hamano4-12/+17
2009-08-26Merge branch 'jc/maint-clean-nested-dir-safety' into maintJunio C Hamano6-5/+63
2009-08-26Merge branch 'jk/maint-merge-msg-fix' into maintJunio C Hamano4-11/+75
2009-08-26Merge branch 'jc/apply-epoch-patch' into maintJunio C Hamano2-1/+176
2009-08-26Merge branch 'jp/symlink-dirs' into maintJunio C Hamano4-1/+114
2009-08-26Merge branch 'maint-1.6.3' into maintJunio C Hamano2-0/+15
2009-08-26Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3Junio C Hamano2-0/+15
2009-08-25checkout: do not imply "-f" on unborn branchesJeff King2-9/+43
2009-08-23xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano1-31/+49
2009-08-23xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano1-2/+4
2009-08-21GIT 1.6.4.1v1.6.4.1Junio C Hamano4-3/+50
2009-08-21Merge branch 'bc/maint-am-email' into maintJunio C Hamano2-1/+34
2009-08-21Merge branch 'jc/maint-merge-recursive-fix' into maintJunio C Hamano2-3/+80
2009-08-21Merge branch 'zf/maint-gitweb-acname' into maintJunio C Hamano1-3/+2
2009-08-21Merge branch 'np/maint-limit-delta-cache' into maintJunio C Hamano2-4/+12
2009-08-21Merge branch 'jk/maint-show-tag' into maintJunio C Hamano1-1/+7
2009-08-21Merge branch 'sb/maint-pull-rebase' into maintJunio C Hamano2-3/+24
2009-08-18http.c: don't assume that urls don't end with slashTay Ray Chuan1-1/+3
2009-08-18filter-branch: make the usage string fit on 80 chars terminals.Matthieu Moy1-6/+6
2009-08-18filter-branch: add an example how to add ACKs to a range of commitsJohannes Schindelin1-0/+10
2009-08-18check_path(): allow symlinked directories to checkout-index --prefixJunio C Hamano3-5/+18
2009-08-17docs: describe impact of repack on "clone -s"Jeff King1-2/+10
2009-08-15add -p: do not attempt to coalesce mode changesThomas Rast2-1/+5
2009-08-15git add -p: demonstrate failure when staging both mode and hunkKirill Smelkov1-0/+11
2009-08-14Fix "unpack-objects --strict"Junio C Hamano2-7/+44
2009-08-12Merge branch 'maint-1.6.3' into maintJunio C Hamano9-12/+12
2009-08-12push: point to 'git pull' and 'git push --force' in case of non-fast forwardMatthieu Moy4-5/+103
2009-08-12Documentation: add: <filepattern>... is optionalPaul Bolle1-1/+1
2009-08-12Change mentions of "git programs" to "git commands"Ori Avtalion8-10/+10
2009-08-12Documentation: merge: one <remote> is requiredPaul Bolle1-1/+1
2009-08-12help.c: give correct structure's size to memset()Johan Herland1-1/+1
2009-08-10Merge branch 'maint-1.6.3' into maintJunio C Hamano2-4/+4
2009-08-10Fix typos in git-remote.txt and git-symbolic-ref.txtŠtěpán Němec2-4/+4
2009-08-10git-am: print fair error message when format detection failsNicolas Sebrecht1-1/+5
2009-08-10am: allow individual e-mail files as inputJunio C Hamano2-0/+29
2009-08-10Correctly mark cover letters' encodings if they are not pure ASCIIJohannes Schindelin1-0/+4
2009-08-10Expose the has_non_ascii() functionJohannes Schindelin3-12/+13
2009-08-09git-instaweb: fix mod_perl detection for apache2Mark A Rada1-1/+1
2009-08-09merge: indicate remote tracking branches in merge messageJeff King3-1/+16
2009-08-09merge: fix incorrect merge message for ambiguous tag/branchJeff King3-11/+10
2009-08-09add tests for merge message headingsJeff King1-0/+50
2009-08-09t6035-merge-dir-to-symlink depends on SYMLINKS prerequisiteJohannes Sixt1-0/+6
2009-08-07Merge branch 'maint-1.6.3' into maintJunio C Hamano2-11/+27
2009-08-07Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2-11/+27
2009-08-07Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2-11/+27
2009-08-07Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-11/+27
2009-08-07verify-pack -v: do not report "chain length 0"Junio C Hamano1-8/+19
2009-08-07t5510: harden the way verify-pack is usedJunio C Hamano1-3/+8
2009-08-05don't let the delta cache grow unbounded in 'git repack'Nicolas Pitre2-4/+12
2009-08-05Merge branch 'maint-1.6.3' into maintJunio C Hamano5-9/+11
2009-08-05gitweb: parse_commit_text encoding fixZoltán Füzesi1-3/+2
2009-08-05gitweb/README: Document $base_urlJakub Narebski1-0/+6
2009-08-05Documentation: git submodule: add missing options to synopsisJens Lehmann1-2/+2
2009-08-05Better usage string for reflog.Matthieu Moy1-1/+1
2009-08-04hg-to-git: don't import the unused popen2 moduleMiklos Vajna1-1/+1
2009-08-04send-email: remove debug traceErik Faye-Lund1-1/+0
2009-07-31config: Keep inner whitespace verbatimBjörn Steinbrink2-6/+9
2009-07-30merge-recursive: don't segfault while handling rename clashesJunio C Hamano2-3/+80
2009-07-29git-checkout: be careful about untracked symlinksLinus Torvalds3-2/+18
2009-07-29lstat_cache: guard against full match of length of 'name' parameterKjetil Barvik2-1/+5
2009-07-29Demonstrate bugs when a directory is replaced with a symlinkPickens, James E1-0/+87
2009-07-29clean: require double -f options to nuke nested git repository and work treeJunio C Hamano6-5/+63
2009-07-29GIT 1.6.4v1.6.4Junio C Hamano3-7/+15
2009-07-29Sync with 1.6.3.4Junio C Hamano3-2/+39
2009-07-28GIT 1.6.3.4v1.6.3.4Junio C Hamano3-2/+38
2009-07-28config.txt: document add.ignore-errorsStephen Boyd1-0/+5
2009-07-28request-pull: allow ls-remote to notice remote.$nickname.uploadpackTom Grennan1-1/+1
2009-07-28Update the documentation of the raw diff output formatDavid Kågedal5-9/+10
2009-07-28git-rerere.txt: Clarify ambiguity of the config variableMichael J Gruber1-1/+1
2009-07-26t9143: do not fail if Compress::Zlib is missingEric Wong1-3/+12
2009-07-26Trivial path quoting fixes in git-instawebSean Estabrooks1-2/+2
2009-07-26Merge branch 'gp/maint-rebase-p-onto'Junio C Hamano2-1/+81
2009-07-26Merge branch 'en/fast-export'Junio C Hamano3-8/+187
2009-07-26GIT 1.6.4-rc3v1.6.4-rc3Junio C Hamano1-4/+7
2009-07-25Documentation/config.txt: a variable can be defined on the section header lineNanako Shiraishi1-1/+2
2009-07-25Merge git://git.bogomips.org/git-svnJunio C Hamano4-6/+122
2009-07-25git svn: make minimize URL more reliable over http(s)Eric Wong1-1/+5
2009-07-25Disable asciidoc 8.4.1+ semantics for `{plus}` and friendsThomas Rast1-1/+1
2009-07-25git svn: avoid escaping '/' when renaming/copying filesEric Wong1-1/+1
2009-07-25t9142: stop httpd after the testEric Wong1-0/+2
2009-07-25git svn: the branch command no longer needs the full pathEric Wong2-7/+20
2009-07-25git svn: revert default behavior for --minimize-urlEric Wong3-5/+21
2009-07-25git svn: add gc commandRobert Allan Zeh3-0/+81
2009-07-25Merge branch 'maint'Junio C Hamano4-17/+19
2009-07-25t8005: Nobody writes Russian in shift_jisJunio C Hamano4-17/+19
2009-07-25Merge branch 'maint'Junio C Hamano2-5/+9
2009-07-25Fix severe breakage in "git-apply --whitespace=fix"Junio C Hamano2-5/+9
2009-07-25Update release notes for 1.6.4Junio C Hamano1-2/+13
2009-07-25Merge branch 'js/maint-graft-unhide-true-parents'Junio C Hamano7-3/+31
2009-07-25Merge branch 'av/maint-config-reader'Junio C Hamano2-6/+57
2009-07-25Merge branch 'jk/maint-send-email-alias-loop'Junio C Hamano1-7/+11
2009-07-24After renaming a section, print any trailing variable definitionsAlex Vandiver2-3/+41
2009-07-24Make section_name_match start on '[', and return the length on successAlex Vandiver1-3/+16
2009-07-24send-email: detect cycles in alias expansionJeff King1-7/+11
2009-07-24Show the presence of untracked files in the bash prompt.Daniel Trstenjak1-2/+13
2009-07-24Merge branch 'maint'Junio C Hamano4-33/+53
2009-07-24SunOS grep does not understand -C<n> nor -eJunio C Hamano1-0/+1
2009-07-24Fix export_marks() error handling.Matthias Andree1-4/+10
2009-07-24git repack: keep commits hidden by a graftJohannes Schindelin7-4/+20
2009-07-23Add a test showing that 'git repack' throws away grafted-away parentsBjörn Steinbrink1-0/+12
2009-07-23git branch: clean up detached branch handlingLinus Torvalds1-15/+23
2009-07-23git branch: avoid unnecessary object lookupsLinus Torvalds1-10/+14
2009-07-23git branch: fix performance problemLinus Torvalds1-5/+5
2009-07-22git svn: fix shallow clone when upstream revision is too newEric Wong2-0/+31
2009-07-22do_one_ref(): null_sha1 check is not about broken refJunio C Hamano1-2/+3
2009-07-22configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missingv1.6.4-rc2Brandon Casey1-3/+2
2009-07-22janitor: useless checks before freePierre Habouzit2-3/+2
2009-07-22janitor: add DIV_ROUND_UP and use it.Pierre Habouzit3-2/+4
2009-07-22refactor: use bitsizeof() instead of 8 * sizeof()Pierre Habouzit3-3/+4
2009-07-22janitor: use NULL and not 0 for pointers.Pierre Habouzit1-1/+1
2009-07-22git stash: modernize use of "dashed" git-XXX callsMartin Koegler1-3/+3
2009-07-22Improve doc for format-patch threading options.Yann Dirson2-12/+31
2009-07-22List send-email config options in config.txt.Yann Dirson1-0/+44
2009-07-22configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN testsBrandon Casey2-2/+3
2009-07-22Merge branch 'maint'Junio C Hamano4-18/+118
2009-07-22Trailing whitespace and no newline fixSZEDER Gábor2-3/+20
2009-07-22diff --cc: a lost line at the beginning of the file is shown incorrectlyJunio C Hamano2-7/+93
2009-07-22combine-diff.c: fix performance problem when folding common deleted linesJunio C Hamano1-8/+5
2009-07-22Fix rebase -p --ontoGreg Price2-1/+81
2009-07-19git svn: fix reparenting when ugly http(s) URLs are usedEric Wong1-2/+4
2009-07-19git svn: rename tests that had conflicting numbersEric Wong2-0/+0
2009-07-19show: add space between multiple itemsJeff King1-0/+6
2009-07-19show: suppress extra newline when showing annotated tagJeff King1-1/+1
2009-07-19pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2-6/+13
2009-07-19t5520-pull: Test for rebased upstream + fetch + pull --rebaseSanti Béjar1-0/+14
2009-07-18Updates to draft release notes to 1.6.4Junio C Hamano1-10/+47
2009-07-18push: do not give big warning when no preference is configuredJunio C Hamano3-28/+2
2009-07-18t4202-log.sh: Test git log --no-walk sort orderMichael J Gruber1-0/+20
2009-07-18cvsexportcommit: reorder tests to quiet intermittent failureMike Ralphson1-19/+22
2009-07-18Merge branch 'maint'Junio C Hamano3-4/+4