Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.1-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.1-rc0
Junio C Hamano
Merge branch 'da/maint-python-startup' * da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method
Junio C Hamano
Merge branch 'ic/bash-completion-rpm' * ic/bash-completion-rpm: RPM spec: include bash completion support
Junio C Hamano
Merge branch 'sb/fmt-merge-msg' * sb/fmt-merge-msg: fmt-merge-msg: hide summary option fmt-merge-msg: remove custom string_list implementation string-list: add unsorted_string_list_lookup() fmt-merge-msg: use pretty.c routines t6200: test fmt-merge-msg more t6200: modernize with test_tick fmt-merge-msg: be quiet if nothing to merge
Junio C Hamano
Merge branch 'jc/conflict-marker-size' * jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute
Junio C Hamano
Merge branch 'ef/maint-empty-commit-log' * ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message
Junio C Hamano
Merge branch 'sg/bash-completion' * sg/bash-completion: bash: completion for gitk aliases bash: support user-supplied completion scripts for aliases bash: support user-supplied completion scripts for user's git commands bash: improve aliased command recognition
Junio C Hamano
Revert "Link against libiconv on IRIX" Brandon Casey reports: Subject: Re: [PATCH] Link against libiconv on IRIX Date: Mon, 05 Apr 2010 11:45:32 -0500 Message-Id: <1UypQMCHLT57SnjSQIM66RTkLalsvavG8xXoQJv4rEQ@cipher.nrlssc.navy.mil> This breaks compilation on IRIX 6.5.29m for me since there is no separate libiconv.so. What version of IRIX are you using? On my system, even the iconv utility doesn't link ag…
Junio C Hamano
Merge branch 'maint' * maint: pack-protocol.txt: fix pkt-line lengths pack-protocol.txt: fix spelling
Tay Ray Chuan
pack-protocol.txt: fix pkt-line lengths Previously, the lengths were 4-bytes short. Fix it such that the lengths reflect the total length of the pkt-line, as per spec. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan
pack-protocol.txt: fix spelling s/paramater/parameter/. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mb/rebase-i-no-ff' * mb/rebase-i-no-ff: Teach rebase the --no-ff option. Conflicts: git-rebase--interactive.sh t/t3404-rebase-interactive.sh
Junio C Hamano
Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' * sp/maint-http-backend-die-triggers-die-recursively: http-backend: Don't infinite loop during die()
Junio C Hamano
Merge branch 'rr/imap-send-unconfuse-from-line' * rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body
Junio C Hamano
Merge branch 'mg/use-default-abbrev-length-in-rev-list' * mg/use-default-abbrev-length-in-rev-list: rev-list: use default abbrev length when abbrev-commit is in effect
Junio C Hamano
Merge branch 'mg/maint-send-email-lazy-editor' * mg/maint-send-email-lazy-editor: send-email: lazily assign editor variable
Junio C Hamano
Merge branch 'rb/maint-python-path' * rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD
Junio C Hamano
Merge branch 'jn/merge-diff3-label' * jn/merge-diff3-label: merge-recursive: add a label for ancestor cherry-pick, revert: add a label for ancestor revert: clarify label on conflict hunks compat: add mempcpy() checkout -m --conflict=diff3: add a label for ancestor merge_trees(): add ancestor label parameter for diff3-style output merge_file(): add comment explaining behavior wrt conflict style checkout --conflict=dif…
Junio C Hamano
Merge branch 'ef/cherry-abbrev' * ef/cherry-abbrev: ls: remove redundant logic cherry: support --abbrev option
Junio C Hamano
Merge branch 'bw/template-tool-buildconfig' * bw/template-tool-buildconfig: Modernize git calling conventions in hook templates Make templates honour SHELL_PATH and PERL_PATH
Junio C Hamano
Merge branch 'mg/mailmap-update' * mg/mailmap-update: .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
Junio C Hamano
Merge branch 'bc/t5505-fix' * bc/t5505-fix: t/t5505-remote.sh: escape * to prevent interpretation by shell as glob t5505: add missing && t5505: remove unnecessary subshell invocations
Junio C Hamano
Merge branch 'gh/maint-stash-show-error-message' * gh/maint-stash-show-error-message: Improve error messages from 'git stash show'
Junio C Hamano
Merge branch 'rs/threaded-grep-context' * rs/threaded-grep-context: grep: enable threading for context line printing Conflicts: grep.c
Junio C Hamano
Merge branch 'bc/maint-daemon-sans-ss-family' * bc/maint-daemon-sans-ss-family: daemon.c: avoid accessing ss_family member of struct sockaddr_storage
Junio C Hamano
Merge branch 'bc/acl-test' * bc/acl-test: t/t1304: make a second colon optional in the mask ACL check t/t1304: set the ACL effective rights mask t/t1304: use 'test -r' to test readability rather than looking at mode bits t/t1304: set the Default ACL base entries t/t1304: avoid -d option to setfacl
Junio C Hamano
Merge branch 'ja/send-email-ehlo' * ja/send-email-ehlo: git-send-email.perl - try to give real name of the calling host to HELO/EHLO git-send-email.perl: add option --smtp-debug git-send-email.perl: improve error message in send_message()
Junio C Hamano
Merge branch 'do/rebase-i-arbitrary' * do/rebase-i-arbitrary: rebase--interactive: don't require what's rebased to be a branch Conflicts: t/t3404-rebase-interactive.sh
Junio C Hamano
Merge branch 'ak/everyday-git' * ak/everyday-git: everyday: fsck and gc are not everyday operations
Jonathan Nieder
Makefile: future-proof Cygwin version check Tweak the condition that detects old Cygwin versions to not include versions such as 1.8, 1.11, and 2.1. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next