summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-04-11Git 1.7.0.5v1.7.0.5Junio C Hamano4-3/+30
2010-04-11Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maintJunio C Hamano1-1/+1
2010-04-11blame documentation: -M/-C notice copied lines as well as moved onesJunio C Hamano1-9/+10
2010-04-09Let check_preimage() use memset() to initialize "struct checkout"Jens Lehmann1-4/+1
2010-04-09Merge branch 'ef/maint-empty-commit-log' into maintJunio C Hamano2-1/+13
2010-04-09Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano2-14/+33
2010-04-09Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maintJunio C Hamano1-7/+11
2010-04-09Merge branch 'mg/maint-send-email-lazy-editor' into maintJunio C Hamano1-1/+4
2010-04-09Merge branch 'rr/imap-send-unconfuse-from-line' into maintJunio C Hamano2-8/+10
2010-04-09Merge branch 'rb/maint-python-path' into maintJunio C Hamano5-4/+9
2010-04-09Merge branch 'gh/maint-stash-show-error-message' into maintJunio C Hamano1-2/+6
2010-04-09Merge branch 'mg/mailmap-update' into maintJunio C Hamano1-0/+3
2010-04-09Merge branch 'bc/maint-daemon-sans-ss-family' into maintJunio C Hamano1-4/+7
2010-04-09fetch/push: fix usage stringsTay Ray Chuan4-10/+10
2010-04-09branch: say "Reset to" in reflog entries for 'git branch -f' operationsTay Ray Chuan1-1/+1
2010-04-08docs: clarify "branch -l"Jeff King1-0/+2
2010-04-04pack-protocol.txt: fix pkt-line lengthsTay Ray Chuan1-4/+4
2010-04-04pack-protocol.txt: fix spellingTay Ray Chuan1-1/+1
2010-03-31Git 1.7.0.4v1.7.0.4Junio C Hamano3-4/+13
2010-03-31Merge branch 'jc/maint-refs-dangling' into maintJunio C Hamano2-7/+10
2010-03-31Documentation: show-ref <pattern>s are optionalHolger Weiß1-1/+1
2010-03-31Link against libiconv on IRIXHolger Weiß1-0/+2
2010-03-31Don't redefine htonl and ntohl on big-endianHolger Weiß1-0/+2
2010-03-31gitweb: git_get_project_config requires only $git_dir, not also $projectJakub Narebski1-2/+1
2010-03-31Updated the usage string of git resetJan Stępień1-1/+2
2010-03-30Documentation: Clarify support for smart HTTP backendGreg Bacon1-1/+1
2010-03-30Windows: fix utime() for read-only filesJohannes Sixt1-2/+18
2010-03-30diff: fix textconv error zombiesJohannes Sixt1-6/+11
2010-03-29format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2-1/+12
2010-03-28Prepare for 1.7.0.4Junio C Hamano2-1/+20
2010-03-28Merge branch 'cp/add-u-pathspec' into maintJunio C Hamano3-9/+39
2010-03-28t9350: fix careless use of "cd"Junio C Hamano1-33/+38
2010-03-28difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2-5/+16
2010-03-28fast-export: don't segfault when marks file cannot be openedSverre Rabbelier1-1/+1
2010-03-25send-email: lazily assign editor variableMichael J Gruber1-1/+4
2010-03-24diff --check: honor conflict-marker-size attributeJunio C Hamano2-14/+33
2010-03-24Merge branch 'jc/color-attrs' into maintJunio C Hamano3-14/+41
2010-03-24Merge branch 'jk/maint-add-ignored-dir' into maintJunio C Hamano3-4/+103
2010-03-24Merge branch 'bg/apply-fix-blank-at-eof' into maintJunio C Hamano4-40/+450
2010-03-24http-backend: Don't infinite loop during die()Shawn O. Pearce1-7/+11
2010-03-24Correct references to /usr/bin/python which does not exist on FreeBSDR. Tyler Ballance5-4/+9
2010-03-24Documentation: explain the meaning of "-g" in git-describe outputMarkus Heidelberg1-0/+3
2010-03-24imap-send: Remove limitation on message bodyRamkumar Ramachandra2-8/+10
2010-03-21Git 1.7.0.3v1.7.0.3Junio C Hamano3-10/+5
2010-03-21Merge branch 'maint-1.6.6' into maintJunio C Hamano4-14/+6
2010-03-21.mailmap: Map the the first submissions of MJG by e-mailMichael J Gruber1-0/+1
2010-03-21Documentation/git-clone: Transform description list into item listMichael J Gruber1-5/+5
2010-03-21Documentation/urls: Remove spurious example markersMichael J Gruber1-6/+0
2010-03-21Documentation/gitdiffcore: Remove misleading date in headingMichael J Gruber1-1/+1
2010-03-21Documentation/git-reflog: Fix formatting of command listsMichael J Gruber1-2/+0
2010-03-21rev-list: fix --pretty=oneline with empty messageErik Faye-Lund2-1/+13
2010-03-20.mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" ShukelaMichael J Gruber1-0/+3
2010-03-20Update draft release notes to 1.7.0.3Junio C Hamano1-1/+7
2010-03-20fetch: Fix minor memory leakAndreas Gruenbacher1-2/+3
2010-03-20fetch: Future-proof initialization of a refspec on stackAndreas Gruenbacher1-3/+1
2010-03-20fetch: Check for a "^{}" suffix with suffixcmp()Andreas Gruenbacher1-1/+1
2010-03-20daemon: parse_host_and_port SIGSEGV if port is specifiedImre Deak1-1/+1
2010-03-20Makefile: Fix CDPATH problemJonathan Nieder1-0/+6
2010-03-20pull: replace unnecessary sed invocationStephen Boyd1-1/+1
2010-03-17Documentation: receive.denyCurrentBranch defaults to 'refuse'Thomas Rast1-1/+1
2010-03-17bash: complete *_HEAD refs if presentIan Ward Comfort1-1/+3
2010-03-16Improve error messages from 'git stash show'Gustaf Hendeby1-2/+6
2010-03-16daemon.c: avoid accessing ss_family member of struct sockaddr_storageBrandon Casey1-4/+7
2010-03-15refs: ref entry with NULL sha1 is can be a dangling symrefJunio C Hamano2-7/+10
2010-03-15Documentation/git-read-tree: clarify 2-tree mergeMichael J Gruber1-13/+15
2010-03-15Documentation/git-read-tree: fix table layoutMichael J Gruber1-10/+10
2010-03-13tests for "git add ignored-dir/file" without -fJunio C Hamano1-0/+79
2010-03-13dir: fix COLLECT_IGNORED on excluded prefixesJeff King1-2/+18
2010-03-13t0050: mark non-working test as suchJunio C Hamano1-2/+6
2010-03-13don't use default revision if a rev was specifiedDave Olszewski2-2/+13
2010-03-13for_each_recent_reflog_ent(): use strbuf, fix offset handlingRené Scharfe1-10/+12
2010-03-13t/Makefile: remove test artifacts upon "make clean"Junio C Hamano1-0/+2
2010-03-13blame: fix indent of line numbersRené Scharfe2-2/+20
2010-03-11t9400: Use test_cmp when appropriateJunio C Hamano1-12/+12
2010-03-08Merge accumulated fixes to prepare for 1.7.0.3Junio C Hamano2-1/+35
2010-03-08Merge branch 'mw/maint-gcc-warns-unused-write' into maintJunio C Hamano1-4/+6
2010-03-08Merge branch 'fn/maint-mkdtemp-compat' into maintJunio C Hamano1-1/+1
2010-03-08Merge branch 'gb/maint-submodule-env' into maintJunio C Hamano8-33/+69
2010-03-08Merge branch 'as/maint-expire' into maintJunio C Hamano4-18/+86
2010-03-08Merge branch 'ml/maint-grep-doc' into maintJunio C Hamano1-13/+17
2010-03-08Merge branch 'jk/maint-push-tracking-wo-remote' into maintJunio C Hamano1-1/+1
2010-03-08Merge branch 'jc/fetch-param' into maintJunio C Hamano2-33/+88
2010-03-08Merge branch 'ne/pack-local-doc' into maintJunio C Hamano1-8/+7
2010-03-08Merge branch 'jk/maint-add--interactive-delete' into maintJunio C Hamano2-1/+31
2010-03-08Merge branch 'mm/mkstemps-mode-for-packfiles' into maintJunio C Hamano8-93/+172
2010-03-08Merge branch 'jc/maint-fix-mailinfo-strip' into maintJunio C Hamano2-3/+2
2010-03-08Merge branch 'jc/grep-author-all-match-implicit' into maintJunio C Hamano6-10/+57
2010-03-08Merge branch 'jc/checkout-detached' into maintJunio C Hamano5-12/+46
2010-03-08Merge branch 'maint-1.6.6' into maintJunio C Hamano0-0/+0
2010-03-07Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6Junio C Hamano2-0/+4
2010-03-07Merge branch 'sp/maint-push-sideband' into maint-1.6.6Junio C Hamano10-133/+371
2010-03-07Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6Junio C Hamano1-1/+39
2010-03-07Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6Junio C Hamano1-1/+1
2010-03-07Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6Junio C Hamano2-1/+9
2010-03-07Merge branch 'rs/optim-text-wrap' into maint-1.6.6Junio C Hamano3-37/+42
2010-03-07Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6Junio C Hamano1-0/+3
2010-03-07Merge branch 'cc/maint-bisect-paths' into maint-1.6.6Junio C Hamano2-0/+11
2010-03-07color: allow multiple attributesJunio C Hamano3-14/+41
2010-03-07Git 1.7.0.2v1.7.0.2Junio C Hamano3-8/+3
2010-03-07unset GREP_OPTIONS in test-lib.shBert Wesarg1-0/+2
2010-03-06t3417: Add test cases for "rebase --whitespace=fix"Björn Gustavsson1-0/+126
2010-03-06t4124: Add additional tests of --whitespace=fixBjörn Gustavsson1-0/+170
2010-03-06apply: Allow blank context lines to match beyond EOFBjörn Gustavsson1-30/+138
2010-03-06apply: Remove the quick rejection testBjörn Gustavsson2-5/+16
2010-03-06apply: Don't unnecessarily update line lengths in the preimageBjörn Gustavsson1-11/+6
2010-03-06stash: suggest the correct command line for unknown options.Matthieu Moy1-0/+1
2010-03-06t7406: Fix submodule init config testsStephen Boyd1-8/+16
2010-03-04Update draft release notes to 1.7.0.2Junio C Hamano1-1/+25
2010-03-04Merge branch 'jn/gitweb-config-error-die' into maintJunio C Hamano1-3/+6
2010-03-04Merge branch 'jn/maint-fix-pager' into maintJunio C Hamano10-15/+268
2010-03-04Merge branch 'tr/maint-cherry-pick-list' into maintJunio C Hamano1-0/+3
2010-03-04Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano2-0/+38
2010-03-04Merge branch 'rs/optim-text-wrap' into maintJunio C Hamano3-37/+42
2010-03-04Merge branch 'dp/read-not-mmap-small-loose-object' into maintJunio C Hamano1-0/+10
2010-03-04Merge branch 'np/compress-loose-object-memsave' into maintJunio C Hamano1-14/+19
2010-03-04Merge branch 'jc/maint-status-preload' into maintJunio C Hamano1-1/+1
2010-03-04Merge branch 'gf/maint-sh-setup-nongit-ok' into maintJunio C Hamano1-1/+1
2010-03-04Merge branch 'cc/maint-bisect-paths' into maintJunio C Hamano2-0/+11
2010-03-04Merge branch 'maint-1.6.6' into maintJunio C Hamano1-1/+1
2010-03-04Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano1-1/+1
2010-03-04Remove extra '-' from git-am(1)Michal Sojka1-1/+1
2010-03-03run-command.c: fix build warnings on UbuntuMichael Wookey1-4/+6
2010-03-02Start preparing for 1.7.0.2Junio C Hamano2-1/+23
2010-03-02Merge branch 'tc/maint-transport-ls-remote-with-void' into maintJunio C Hamano2-1/+10
2010-03-02Merge branch 'hm/maint-imap-send-crlf' into maintJunio C Hamano1-1/+39
2010-03-02Merge branch 'sp/maint-push-sideband' into maintJunio C Hamano10-134/+370
2010-03-02Merge branch 'jc/maint-fix-test-perm' into maintJunio C Hamano2-0/+4
2010-03-02Merge branch 'np/fast-import-idx-v2' into maintJunio C Hamano2-95/+84
2010-03-02gitweb: Fix project-specific feature override behaviorJakub Narebski2-6/+21
2010-03-02gitweb multiple project roots documentationSylvain Rabot1-3/+64
2010-03-01bisect: error out when passing bad path parametersChristian Couder2-0/+11
2010-02-28Git 1.7.0.1v1.7.0.1Junio C Hamano3-7/+12
2010-02-28Remove reference to GREP_COLORS from documentationMark Lodato1-3/+1
2010-02-28sha1_name: fix segfault caused by invalid index accessMarkus Heidelberg1-14/+18
2010-02-28reflog: honor gc.reflogexpire=neverAdam Simpkins2-4/+43
2010-02-28prune: honor --expire=neverAdam Simpkins2-14/+43
2010-02-25Merge branch 'maint-1.6.6' into maintJunio C Hamano1-0/+1
2010-02-25grep docs: document --no-index optionMark Lodato1-4/+8
2010-02-25grep docs: --cached and <tree>... are incompatibleMark Lodato1-3/+3
2010-02-25grep docs: use AsciiDoc literals consistentlyMark Lodato1-5/+5
2010-02-25grep docs: pluralize "Example" sectionMark Lodato1-2/+2
2010-02-25t3301-notes: insert a shbang line in ./fake_editor.shJohannes Sixt1-0/+1
2010-02-25Fix gitmkdtemp: correct test for mktemp() return valueFilippo Negroni1-1/+1
2010-02-24pack-objects documentation: Fix --honor-pack-keep as well.Nelson Elhage1-2/+2
2010-02-24is_submodule_modified(): clear environment properlyGiuseppe Bilotta1-11/+11
2010-02-24submodules: ensure clean environment when operating in a submoduleGiuseppe Bilotta1-10/+10
2010-02-24shell setup: clear_local_git_env() functionGiuseppe Bilotta1-0/+7
2010-02-24rev-parse: --local-env-vars optionGiuseppe Bilotta2-0/+13
2010-02-24Refactor list of of repo-local env varsGiuseppe Bilotta3-12/+28
2010-02-24pack-objects documentation: reword "objects that appear in the standard input"Junio C Hamano1-3/+3
2010-02-24commit: quote the user name in the exampleMatt Kraai1-1/+1
2010-02-24Merge branch 'ml/maint-grep-doc' into maintJunio C Hamano1-5/+12
2010-02-24fetch --all/--multiple: keep all the fetched branch informationJunio C Hamano2-7/+40
2010-02-24push: fix segfault for odd configJeff King1-1/+1
2010-02-24builtin-fetch --all/--multi: propagate options correctlyJunio C Hamano2-1/+29
2010-02-24t5521: fix and modernizeJunio C Hamano1-26/+20
2010-02-23am: remove rebase-apply directory before gcJonathan Nieder1-2/+1
2010-02-23rerere: fix memory leak if rerere images can't be readBert Wesarg1-3/+6
2010-02-23Documentation: mention conflict marker size argument (%L) for merge driverBert Wesarg1-1/+2
2010-02-22add-interactive: fix bogus diff header line orderingJeff King2-1/+31
2010-02-22Use git_mkstemp_mode instead of plain mkstemp to create object filesMatthieu Moy2-4/+4
2010-02-22git_mkstemps_mode: don't set errno to EINVAL on exit.Matthieu Moy1-1/+0
2010-02-22Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.Matthieu Moy3-20/+10
2010-02-22git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.Matthieu Moy3-2/+27
2010-02-22Move gitmkstemps to path.cMatthieu Moy3-71/+69
2010-02-22Add a testcase for ACL with restrictive umask.Matthieu Moy1-0/+67
2010-02-22tests: Fix race condition in t7006-pagerJonathan Nieder1-6/+6
2010-02-21sha1_file: be paranoid when creating loose objectsNicolas Pitre1-0/+9
2010-02-21git-diff: add a test for git diff --quiet -wLarry D'Anna1-0/+15
2010-02-21hash-object: don't use mmap() for small filesDmitry Potapov1-0/+10
2010-02-21sha1_file: don't malloc the whole compressed result when writing out objectsNicolas Pitre1-14/+10
2010-02-21t7006-pager: if stdout is not a terminal, make a new oneJonathan Nieder2-11/+82
2010-02-20cherry_pick_list: quit early if one side is emptyThomas Rast1-0/+3
2010-02-20tests: Add tests for automatic use of pagerJonathan Nieder1-0/+163
2010-02-20Documentation: pack-objects: Clarify --local's semantics.Nelson Elhage1-5/+4
2010-02-20utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()René Scharfe1-6/+17
2010-02-20utf8.c: remove strbuf_write()René Scharfe1-13/+5
2010-02-20utf8.c: remove print_spaces()René Scharfe1-9/+6
2010-02-20utf8.c: remove print_wrapped_text()René Scharfe3-9/+14
2010-02-20git-p4: fix bug in symlink handlingEvan Powers1-3/+2
2010-02-19t1450: fix testcases that were wrongly expecting failureThomas Rast1-8/+8
2010-02-19mailinfo: do not strip leading spaces even for a header lineJunio C Hamano2-3/+2
2010-02-19Documentation: Fix indentation problem in git-commit(1)Jacob Helwig1-3/+3
2010-02-19Merge branch 'jk/maint-rmdir-fix' into maintJunio C Hamano2-1/+9
2010-02-18rm: fix bug in recursive subdirectory removalJeff King2-1/+9
2010-02-18Documentation: describe --thin more accuratelyStephen Boyd5-28/+36
2010-02-17docs: don't talk about $GIT_DIR/refs/ everywhereJeff King10-36/+39
2010-02-17Update 1.7.0.1 release notesJunio C Hamano1-1/+1
2010-02-17Merge branch 'jk/cherry-pick-reword' into maintJunio C Hamano1-23/+19
2010-02-17Merge branch 'jk/grep-double-dash' into maintJunio C Hamano2-0/+43
2010-02-17Merge branch 'jc/typo' into maintJunio C Hamano17-19/+20
2010-02-17status: preload index to optimize lstat(2) callsJunio C Hamano1-1/+1
2010-02-17fast-import: use the diff_delta() max_delta_size argumentNicolas Pitre1-6/+2
2010-02-17fast-import: honor pack.indexversion and pack.packsizelimit config varsNicolas Pitre1-0/+11
2010-02-17fast-import: make default pack size unlimitedNicolas Pitre2-10/+7
2010-02-17fast-import: use write_idx_file() instead of custom codeNicolas Pitre1-46/+17
2010-02-17fast-import: use sha1write() for pack dataNicolas Pitre1-10/+25
2010-02-17fast-import: start using struct pack_idx_entryNicolas Pitre1-29/+28
2010-02-17require_work_tree broken with NONGIT_OKGabriel Filion1-1/+1
2010-02-16grep documentation: clarify what files matchMark Lodato1-5/+12