summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-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-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-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
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder4-13/+20
2010-03-20xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2-2/+15
2010-03-20tests: document cherry-pick behavior in face of conflictsJonathan Nieder1-0/+198
2010-03-20tests: document format of conflicts from checkout -mJonathan Nieder1-4/+61
2010-03-20.mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" ShukelaMichael J Gruber1-0/+3
2010-03-20revert: fix tiny memory leak in cherry-pick --ffJonathan Nieder1-1/+2
2010-03-20Update draft release notes to 1.7.1Junio C Hamano1-2/+34
2010-03-20Merge branch 'jk/maint-add-ignored-dir'Junio C Hamano3-4/+103
2010-03-20Merge branch 'ml/color-grep'Junio C Hamano6-43/+123
2010-03-20Merge branch 'jc/color-attrs'Junio C Hamano3-14/+41
2010-03-20Merge branch 'cc/reset-keep'Junio C Hamano5-20/+229
2010-03-20Merge branch 'fl/askpass'Junio C Hamano5-13/+58
2010-03-20Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano4-40/+450
2010-03-20Merge branch 'bw/union-merge-refactor'Junio C Hamano6-79/+92
2010-03-20Merge branch 'maint'Junio C Hamano5-9/+20
2010-03-20Update draft release notes to 1.7.0.3Junio C Hamano1-1/+7
2010-03-20rebase -i: use new --ff cherry-pick optionChristian Couder1-12/+3
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-20Fix a spelling mistake in a git-p4 console messageBenjamin C Meyer1-1/+1
2010-03-20Use test_expect_success for test setupsBrian Gernhardt5-61/+70
2010-03-20Modernize git calling conventions in hook templatesBen Walton7-17/+17
2010-03-20Make templates honour SHELL_PATH and PERL_PATHBen Walton4-6/+19
2010-03-20daemon: parse_host_and_port SIGSEGV if port is specifiedImre Deak1-1/+1
2010-03-20Makefile: Fix occasional GIT-CFLAGS breakageJonathan Nieder1-10/+11
2010-03-20Makefile: Fix CDPATH problemJonathan Nieder1-0/+6
2010-03-20t/t5505-remote.sh: escape * to prevent interpretation by shell as globBrandon Casey1-1/+1
2010-03-20t5505: add missing &&Brandon Casey1-1/+1
2010-03-20t5505: remove unnecessary subshell invocationsBrandon Casey1-39/+4
2010-03-20notes.c: remove inappropriate call to returnBrandon Casey1-1/+1
2010-03-20pull: replace unnecessary sed invocationStephen Boyd1-1/+1
2010-03-17Merge branch 'maint'Junio C Hamano2-2/+4
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-16Merge branch 'maint'Junio C Hamano1-22/+24
2010-03-16everyday: fsck and gc are not everyday operationsAnders Kaseorg1-47/+4
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-16t/t1304: make a second colon optional in the mask ACL checkBrandon Casey1-1/+1
2010-03-16t/t1304: set the ACL effective rights maskBrandon Casey1-0/+1
2010-03-16t/t1304: use 'test -r' to test readability rather than looking at mode bitsBrandon Casey1-14/+1
2010-03-16t/t1304: set the Default ACL base entriesBrandon Casey1-0/+1
2010-03-16t/t1304: avoid -d option to setfaclBrandon Casey1-2/+2
2010-03-15refs: ref entry with NULL sha1 is can be a dangling symrefJunio C Hamano2-7/+10
2010-03-15grep: enable threading for context line printingRené Scharfe2-14/+18
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-15Merge branch 'sd/format-patch-to'Junio C Hamano5-46/+197
2010-03-15Merge branch 'tc/http-cleanup'Junio C Hamano8-39/+66
2010-03-15Merge branch 'tc/transport-verbosity'Junio C Hamano12-41/+92
2010-03-15Merge branch 'ld/push-porcelain'Junio C Hamano5-9/+67
2010-03-15Merge branch 'jh/notes'Junio C Hamano14-196/+2167
2010-03-14rebase--interactive: don't require what's rebased to be a branchDave Olszewski2-2/+9
2010-03-14git-send-email.perl - try to give real name of the calling host to HELO/EHLOJari Aalto1-1/+67
2010-03-14git-send-email.perl: add option --smtp-debugJari Aalto1-2/+7
2010-03-14git-send-email.perl: improve error message in send_message()Jari Aalto1-1/+4
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-13git status: ignoring untracked files must apply to submodules tooJens Lehmann6-4/+17
2010-03-13Merge branch 'maint'Junio C Hamano6-14/+47
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-13Merge git://git.bogomips.org/git-svnJunio C Hamano3-2/+4
2010-03-13t9150,t9151: Add rewrite-root option to initTuomas Suutari2-0/+2
2010-03-13git-svn: Fix merge detecting with rewrite-rootTuomas Suutari1-2/+2
2010-03-12git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann3-9/+88
2010-03-12Refactor dirty submodule detection in diff-lib.cJens Lehmann2-18/+33
2010-03-12Merge branch 'maint'Junio C Hamano1-12/+12
2010-03-12notes: rework subcommands and parse optionsStephen Boyd2-166/+394
2010-03-12git-notes(1): add a section about the meaning of historyThomas Rast1-0/+14
2010-03-12notes: track whether notes_trees were changed at allThomas Rast3-0/+6
2010-03-12notes: add shorthand --ref to override GIT_NOTES_REFThomas Rast2-0/+21
2010-03-12commit --amend: copy notes to the new commitThomas Rast2-0/+18
2010-03-12rebase: support automatic notes copyingThomas Rast5-1/+50
2010-03-12notes: implement helpers needed for note copying during rewriteThomas Rast8-8/+385
2010-03-12notes: implement 'git notes copy --stdin'Thomas Rast5-2/+127
2010-03-12rebase -i: invoke post-rewrite hookThomas Rast2-1/+146
2010-03-12rebase: invoke post-rewrite hookThomas Rast3-0/+45
2010-03-12commit --amend: invoke post-rewrite hookThomas Rast3-1/+92
2010-03-12Documentation: document post-rewrite hookThomas Rast1-0/+34
2010-03-12Support showing notes from more than one notes treeThomas Rast14-30/+437
2010-03-12test-lib: unset GIT_NOTES_REF to stop it from influencing testsThomas Rast1-0/+1
2010-03-11t5516: Use test_cmp when appropriateJunio C Hamano1-3/+3
2010-03-11t9400: Use test_cmp when appropriateJunio C Hamano1-12/+12
2010-03-10Merge branch 'sd/init-template'Junio C Hamano6-12/+67
2010-03-10Merge branch 'sh/am-keep-cr'Junio C Hamano6-10/+141
2010-03-10Merge branch 'cp/add-u-pathspec'Junio C Hamano3-9/+39
2010-03-10Makefile: update check-docs targetJunio C Hamano1-1/+2
2010-03-10Merge branch 'lt/deepen-builtin-source'Junio C Hamano90-107/+107
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-28 04:15:47 +0000