summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-04-23Git 1.7.1v1.7.1Junio C Hamano3-9/+8
2010-04-23Merge branch 'maint'Junio C Hamano1-9/+34
2010-04-23Documentation improvements for the description of short format.Eric Raymond1-9/+34
2010-04-22Sync with 1.7.0.6Junio C Hamano2-1/+15
2010-04-22Git 1.7.0.6v1.7.0.6Junio C Hamano4-3/+17
2010-04-22Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maintJunio C Hamano1-1/+1
2010-04-22Merge branch 'wp/doc-filter-direction' into maintJunio C Hamano1-4/+4
2010-04-22Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano1-9/+12
2010-04-22Merge branch 'da/maint-python-startup' into maintJunio C Hamano1-3/+2
2010-04-21Merge branch 'maint'Junio C Hamano1-2/+6
2010-04-21Documentation/Makefile: fix interrupted builds of user-manual.xmlJonathan Nieder1-2/+6
2010-04-19Merge branch 'maint'Junio C Hamano3-7/+8
2010-04-19t7012: Mark missing tests as TODOMichael J Gruber1-6/+6
2010-04-19reflog: remove 'show' from 'expire's usage stringSZEDER Gábor1-1/+1
2010-04-19Merge branch 'maint-1.6.6' into maintJunio C Hamano1-0/+1
2010-04-19MSVC: Fix build by adding missing termios.h dummyJohannes Sixt1-0/+1
2010-04-18Git 1.7.1-rc2v1.7.1-rc2Junio C Hamano2-2/+9
2010-04-18Merge branch 'rr/remote-helper-doc'Junio C Hamano2-58/+119
2010-04-18Merge branch 'wp/doc-filter-direction'Junio C Hamano1-4/+4
2010-04-18Merge branch 'jk/maint-diffstat-overflow'Junio C Hamano1-9/+12
2010-04-18Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'Junio C Hamano4-5/+64
2010-04-18Merge branch 'maint'Junio C Hamano1-2/+2
2010-04-18Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano9-44/+60
2010-04-18Documentation/remote-helpers: Fix typos and improve languageRamkumar Ramachandra1-28/+23
2010-04-18Fixup: Second argument may be any arbitrary stringRamkumar Ramachandra1-3/+2
2010-04-18Documentation/remote-helpers: Add invocation sectionRamkumar Ramachandra1-1/+34
2010-04-18Documentation/urls: Rewrite to accomodate <transport>::<address>Ramkumar Ramachandra1-23/+36
2010-04-18Documentation/remote-helpers: Rewrite descriptionRamkumar Ramachandra1-6/+27
2010-04-18Documentation: Describe other situations where -z affects git diffCharles Bailey1-2/+2
2010-04-18rebase-interactive: silence warning when no commits rewrittenJeff King1-0/+1
2010-04-18t3301: add tests to use --format="%N"Junio C Hamano1-0/+18
2010-04-17Merge branch 'maint'Junio C Hamano4-13/+23
2010-04-17t6006: do not write to /tmpMatthew Ogilvie1-1/+1
2010-04-17git-instaweb: pass through invoking user's path to gitweb CGI scriptsChris Webb1-2/+2
2010-04-17gitweb: simplify gitweb.min.* generation and clean-up rulesJunio C Hamano1-37/+38
2010-04-17tag -v: use RUN_GIT_CMD to run verify-tagJonathan Nieder1-2/+2
2010-04-17documentation: clarify direction of core.autocrlfWill Palmer1-4/+4
2010-04-17diff: use large integers for diffstat calculationsJeff King1-9/+12
2010-04-17t1010-mktree: Adjust expected result to code and documentationMichael J Gruber1-6/+4
2010-04-17combined diff: correctly handle truncated fileThomas Rast2-6/+16
2010-04-17gitk: Display dirty submodules correctlyJens Lehmann1-8/+21
2010-04-15Document new "already-merged" rule for branch -dJonathan Nieder1-1/+3
2010-04-15Add .depend directories to .gitignoreJonathan Nieder1-1/+1
2010-04-13Merge branch 'maint'Junio C Hamano3-7/+8
2010-04-13pretty: Initialize notes if %N is usedJohannes Gilger3-5/+46
2010-04-13Documentation/config.txt: default gc.aggressiveWindow is 250, not 10Jay Soffian1-1/+1
2010-04-12Docs: Add -X option to git-merge's synopsis.Marc Branchaud2-6/+7
2010-04-11Merge branch 'jl/maint-submodule-gitfile-awareness'Junio C Hamano3-7/+8
2010-04-11Windows: start_command: Support non-NULL dir in struct child_processJohannes Sixt3-7/+8
2010-04-11Sync with 1.7.0.5Junio C Hamano4-11/+39
2010-04-11Merge branch 'jc/doc-submit-gmail'Junio C Hamano1-11/+24
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-11t3507: Make test executableStephen Boyd1-0/+0
2010-04-10Git 1.7.1-rc1v1.7.1-rc1Junio C Hamano1-1/+4
2010-04-10Merge branch 'mr/gitweb-jsmin'Junio C Hamano7-36/+83
2010-04-10Merge branch 'jl/maint-submodule-gitfile-awareness'Junio C Hamano3-17/+47
2010-04-10Teach diff --submodule and status to handle .git files in submodulesJens Lehmann3-17/+47
2010-04-09Merge branch 'maint'Junio C Hamano5-14/+11
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-09Merge branch 'rc/maint-reflog-msg-for-forced-branch'Junio C Hamano1-1/+1
2010-04-09branch: say "Reset to" in reflog entries for 'git branch -f' operationsTay Ray Chuan1-1/+1
2010-04-08Merge early parts of jk/cached-textconvJunio C Hamano3-4/+8
2010-04-08diff.c: work around pointer constness warningsJunio C Hamano1-2/+2
2010-04-08Merge branch 'maint'Junio C Hamano1-0/+2
2010-04-08docs: clarify "branch -l"Jeff King1-0/+2
2010-04-07SubmittingPatches: update GMail sectionJunio C Hamano1-11/+24
2010-04-07Merge branch 'mg/notes-reflog'Junio C Hamano2-0/+10
2010-04-07Merge branch 'jn/mailinfo-scissors'Junio C Hamano1-1/+2
2010-04-07fix typos and grammar in 1.7.1 draft release notesJeff King1-10/+10
2010-04-06notes.h: declare bit field as unsigned to silence compiler complaintsBrandon Casey1-1/+1
2010-04-06Git 1.7.1-rc0v1.7.1-rc0Junio C Hamano1-1/+15
2010-04-06Merge branch 'da/maint-python-startup'Junio C Hamano1-3/+2
2010-04-06Merge branch 'ic/bash-completion-rpm'Junio C Hamano1-0/+7
2010-04-06Merge branch 'sb/fmt-merge-msg'Junio C Hamano5-142/+235
2010-04-06Merge branch 'jc/conflict-marker-size'Junio C Hamano2-14/+33
2010-04-06Merge branch 'ef/maint-empty-commit-log'Junio C Hamano2-1/+13
2010-04-06Merge branch 'sg/bash-completion'Junio C Hamano1-60/+34
2010-04-05Revert "Link against libiconv on IRIX"Junio C Hamano1-2/+0
2010-04-04Merge branch 'maint'Junio C Hamano1-5/+5
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-04-04Teach mailinfo %< as an alternative scissors markJonathan Nieder1-1/+2
2010-04-03Merge branch 'mb/rebase-i-no-ff'Junio C Hamano5-9/+152
2010-04-03Merge branch 'sp/maint-http-backend-die-triggers-die-recursively'Junio C Hamano1-7/+11
2010-04-03Merge branch 'rr/imap-send-unconfuse-from-line'Junio C Hamano2-8/+10
2010-04-03Merge branch 'mg/use-default-abbrev-length-in-rev-list'Junio C Hamano1-1/+1
2010-04-03Merge branch 'mg/maint-send-email-lazy-editor'Junio C Hamano1-1/+4
2010-04-03Merge branch 'rb/maint-python-path'Junio C Hamano5-4/+9
2010-04-03Merge branch 'jn/merge-diff3-label'Junio C Hamano15-79/+405
2010-04-03Merge branch 'ef/cherry-abbrev'Junio C Hamano3-27/+25
2010-04-03Merge branch 'bw/template-tool-buildconfig'Junio C Hamano9-23/+36
2010-04-03Merge branch 'mg/mailmap-update'Junio C Hamano1-0/+3
2010-04-03Merge branch 'bc/t5505-fix'Junio C Hamano1-41/+6
2010-04-03Merge branch 'gh/maint-stash-show-error-message'Junio C Hamano1-2/+6
2010-04-03Merge branch 'rs/threaded-grep-context'Junio C Hamano2-14/+19
2010-04-03Merge branch 'bc/maint-daemon-sans-ss-family'Junio C Hamano1-4/+7
2010-04-03Merge branch 'bc/acl-test'Junio C Hamano1-17/+6
2010-04-03Merge branch 'ja/send-email-ehlo'Junio C Hamano1-3/+77
2010-04-03Merge branch 'do/rebase-i-arbitrary'Junio C Hamano2-2/+9
2010-04-03Merge branch 'ak/everyday-git'Junio C Hamano1-47/+4
2010-04-03Makefile: future-proof Cygwin version checkJonathan Nieder1-1/+1
2010-04-02Fix _XOPEN_SOURCE problem on DragonFlyYONETANI Tomokazu1-1/+2
2010-04-02gitweb: update INSTALL to use shorter make targetMark Rada1-9/+7
2010-04-02gitweb: add documentation to INSTALL regarding gitweb.jsMark Rada1-10/+13
2010-04-02instaweb: add minification awarenessMark Rada2-4/+14
2010-04-02Gitweb: add autoconfigure support for minifiersMark Rada3-16/+22
2010-04-02Gitweb: add support for minifying gitweb.cssMark Rada4-14/+43
2010-04-02Gitweb: add ignore and clean rules for minified filesMark Rada2-1/+2
2010-04-02builtin/commit: remove unnecessary variable definitionMarkus Heidelberg1-1/+1
2010-04-02builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg1-2/+2
2010-04-02Integrate version 3 ciabot scripts into contrib/.Eric Raymond3-0/+426
2010-04-01fix textconv leak in emit_rewrite_diffJeff King1-0/+4
2010-04-01fix const-correctness of write_sha1_fileJeff King2-4/+4
2010-04-01Makefile: update defaults for modern CygwinEric Blake1-10/+12
2010-03-31Sync with 1.7.0.4Junio C Hamano11-17/+51
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-29Merge branch 'maint'Junio C Hamano2-1/+12
2010-03-29format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2-1/+12
2010-03-29refs.c: Write reflogs for notes just like for branch headsMichael J Gruber2-1/+2
2010-03-29t3301-notes: Test the creation of reflog entriesMichael J Gruber1-0/+9
2010-03-29RPM spec: include bash completion supportIan Ward Comfort1-0/+7
2010-03-28Update draft release notes to 1.7.1Junio C Hamano1-9/+10
2010-03-28Merge branch 'cc/cherry-pick-ff'Junio C Hamano8-18/+168
2010-03-28Merge branch 'sb/notes-parse-opt'Junio C Hamano2-159/+382
2010-03-28Merge branch 'maint'Junio C Hamano1-0/+19
2010-03-28Makefile: Remove usage of deprecated Python "has_key" methodDavid Aguilar1-3/+2
2010-03-28rebase -i: make post-rewrite work for 'edit'Thomas Rast2-2/+19
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-28Merge branch 'maint'Junio C Hamano4-39/+55
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-28imap-send: suppress warning about cleartext password with CRAM-MD5Chris Webb1-3/+3
2010-03-25send-email: lazily assign editor variableMichael J Gruber1-1/+4
2010-03-24fmt-merge-msg: hide summary optionStephen Boyd1-1/+3
2010-03-24fmt-merge-msg: remove custom string_list implementationStephen Boyd1-83/+44
2010-03-24string-list: add unsorted_string_list_lookup()Stephen Boyd3-5/+17
2010-03-24fmt-merge-msg: use pretty.c routinesStephen Boyd1-21/+8
2010-03-24t6200: test fmt-merge-msg moreStephen Boyd1-0/+115
2010-03-24t6200: modernize with test_tickStephen Boyd1-35/+29
2010-03-24fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2-0/+22
2010-03-24diff --check: honor conflict-marker-size attributeJunio C Hamano2-14/+33
2010-03-24Merge branch 'jh/maint-submodule-status-in-void'Junio C Hamano1-1/+3
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano25-33/+1366
2010-03-24Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano10-43/+221
2010-03-24Merge branch 'pb/log-first-parent-p-m'Junio C Hamano17-30/+653
2010-03-24Merge branch 'jc/maint-refs-dangling'Junio C Hamano2-7/+10
2010-03-24Merge branch 'maint'Junio C Hamano1-0/+3
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-24Teach rebase the --no-ff option.Marc Branchaud5-10/+152
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-24rev-list: use default abbrev length when abbrev-commit is in effectMichael J Gruber1-1/+1
2010-03-24imap-send: Remove limitation on message bodyRamkumar Ramachandra2-8/+10
2010-03-21Sync with Git 1.7.0.3Junio C Hamano9-25/+13
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-21ls: remove redundant logicErik Faye-Lund2-9/+4
2010-03-21cherry: support --abbrev optionErik Faye-Lund1-18/+21
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-20merge-recursive: add a label for ancestorJonathan Nieder1-0/+1
2010-03-20cherry-pick, revert: add a label for ancestorJonathan Nieder2-3/+6
2010-03-20revert: clarify label on conflict hunksJonathan Nieder2-41/+64
2010-03-20compat: add mempcpy()Jonathan Nieder1-0/+9
2010-03-20checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2-1/+2
2010-03-20merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder2-3/+9
2010-03-20merge_file(): add comment explaining behavior wrt conflict styleJonathan Nieder1-0/+6
2010-03-20checkout --conflict=diff3: add a label for ancestorJonathan Nieder2-3/+3
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder6-15/+17
2010-03-20merge-file --diff3: add a label for ancestorJonathan Nieder2-2/+3
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-23 15:34:40 +0000