summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-05-16Merge branch 'jc/convert'Libravatar Junio C Hamano4-90/+84
* jc/convert: convert: make it harder to screw up adding a conversion attribute convert: make it safer to add conversion attributes convert: give saner names to crlf/eol variables, types and functions convert: rename the "eol" global variable to "core_eol"
2011-05-16Merge branch 'ci/commit--interactive-atomic'Libravatar Junio C Hamano6-31/+75
* ci/commit--interactive-atomic: Test atomic git-commit --interactive Add commit to list of config.singlekey commands Add support for -p/--patch to git-commit Allow git commit --interactive with paths t7501.8: feed a meaningful command Use a temporary index for git commit --interactive
2011-05-16Merge branch 'sg/completion-updates'Libravatar Junio C Hamano1-4/+16
* sg/completion-updates: Revert "completion: don't declare 'local words' to make zsh happy" git-completion: fix regression in zsh support completion: move private shopt shim for zsh to __git_ namespace completion: don't declare 'local words' to make zsh happy
2011-05-16Merge branch 'kk/maint-prefix-in-config-mak'Libravatar Junio C Hamano1-9/+9
* kk/maint-prefix-in-config-mak: Honor $(prefix) set in config.mak* when defining ETC_GIT* Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir" Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
2011-05-16Merge branch 'mg/merge-ff-config'Libravatar Junio C Hamano3-6/+77
* mg/merge-ff-config: tests: check git does not barf on merge.ff values for future versions of git merge: introduce merge.ff configuration variable Conflicts: t/t7600-merge.sh
2011-05-16Merge branch 'maint'Libravatar Junio C Hamano2-2/+17
* maint: Update draft release notes to 1.7.5.2 Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
2011-05-16Update draft release notes to 1.7.5.2Libravatar Junio C Hamano1-0/+15
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-16Merge branch 'jn/maint-format-patch-doc' into maintLibravatar Junio C Hamano1-0/+58
* jn/maint-format-patch-doc: Documentation: describe the format of messages with inline patches
2011-05-16Merge branch 'ss/cherry-pick-x-doc' into maintLibravatar Junio C Hamano1-3/+4
* ss/cherry-pick-x-doc: doc: Clarify that "cherry-pick -x" does not use "git notes"
2011-05-16Merge branch 'vr/merge-base-doc' into maintLibravatar Junio C Hamano2-14/+23
* vr/merge-base-doc: Restructure documentation for git-merge-base. Documentation: update to git-merge-base --octopus
2011-05-16Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maintLibravatar Junio C Hamano1-3/+3
* sr/maint-fast-import-tighten-option-parsing: fast-import: fix option parser for no-arg options
2011-05-16Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintLibravatar Junio C Hamano1-2/+5
* jc/t1506-shell-param-expansion-gotcha: t1507: avoid "${parameter<op>'word'}" inside double-quotes
2011-05-16Merge branch 'jc/fix-add-u-unmerged' into maintLibravatar Junio C Hamano2-39/+30
* jc/fix-add-u-unmerged: Fix "add -u" that sometimes fails to resolve unmerged paths Conflicts: builtin/add.c
2011-05-16Merge branch 'jn/gitweb-dependency' into maintLibravatar Junio C Hamano1-27/+1
* jn/gitweb-dependency: Remove gitweb/gitweb.cgi and other legacy targets from main Makefile git-instaweb: Simplify build dependency on gitweb
2011-05-16Merge branch 'jc/maint-branch-mergeoptions' into maintLibravatar Junio C Hamano2-15/+58
* jc/maint-branch-mergeoptions: merge: make branch.<name>.mergeoptions correctly override merge.<option> Conflicts: builtin/merge.c
2011-05-16Merge branch 'jc/maint-add-p-overlapping-hunks' into maintLibravatar Junio C Hamano3-16/+54
* jc/maint-add-p-overlapping-hunks: t3701: add-p-fix makes the last test to pass "add -p": work-around an old laziness that does not coalesce hunks add--interactive.perl: factor out repeated --recount option t3701: Editing a split hunk in an "add -p" session add -p: 'q' should really quit
2011-05-16Documentation/git-fsck.txt: fix typo: unreadable -> unreachableLibravatar Jim Meyering1-2/+2
Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-15Sync release notes for 1.7.6 to exclude what are in maintenance trackLibravatar Junio C Hamano1-12/+0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-15Merge branch 'maint'Libravatar Junio C Hamano2-9/+17
* maint: Update draft release notes to 1.7.5.2 git_open_noatime(): drop unused parameter sha1_file: typofix
2011-05-15Update draft release notes to 1.7.5.2Libravatar Junio C Hamano1-0/+9
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-15Merge branch 'cn/format-patch-quiet' into maintLibravatar Junio C Hamano2-7/+14
* cn/format-patch-quiet: format-patch: document --quiet option format-patch: don't pass on the --quiet flag
2011-05-15Merge branch 'jm/mergetool-submodules' into maintLibravatar Junio C Hamano2-9/+371
* jm/mergetool-submodules: mergetool: Teach about submodules
2011-05-15Merge branch 'jk/format-patch-quote-special-in-from' into maintLibravatar Junio C Hamano2-1/+102
* jk/format-patch-quote-special-in-from: pretty: quote rfc822 specials in email addresses
2011-05-15Merge branch 'vh/git-svn-doc' into maintLibravatar Junio C Hamano1-11/+11
* vh/git-svn-doc: git-svn.txt: small typeface improvements git-svn.txt: move option descriptions git-svn.txt: fix usage of --add-author-from
2011-05-15git_open_noatime(): drop unused parameterLibravatar Junio C Hamano1-8/+7
Since commit c793430 (Limit file descriptors used by packs, 2011-02-28), the extra parameter added in f2e872aa (Work around EMFILE when there are too many pack files, 2010-11-01) is not used anymore. Remove it. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Shawn O. Pearce <spearce@spearce.org>
2011-05-15sha1_file: typofixLibravatar Junio C Hamano1-1/+1
The number zero is spelled "zero", not "zer0". Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-14Merge branch 'maint'Libravatar Junio C Hamano3-6/+6
* maint: add, merge, diff: do not use strcasecmp to compare config variable names
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesLibravatar Jonathan Nieder3-6/+6
The config machinery already makes section and variable names lowercase when parsing them, so using strcasecmp for comparison just feels wasteful. No noticeable change intended. Noticed-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-13Update draft release notes to 1.7.6Libravatar Junio C Hamano1-30/+16
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-13Merge branch 'bf/commit-template-no-cleanup'Libravatar Junio C Hamano3-1/+25
* bf/commit-template-no-cleanup: Do not strip empty lines / trailing spaces from a commit message template
2011-05-13Merge branch 'jc/t1506-shell-param-expansion-gotcha'Libravatar Junio C Hamano1-2/+5
* jc/t1506-shell-param-expansion-gotcha: t1507: avoid "${parameter<op>'word'}" inside double-quotes
2011-05-13Merge branch 'rr/rerere-libify-clear-gc'Libravatar Junio C Hamano3-75/+88
* rr/rerere-libify-clear-gc: rerere: libify rerere_clear() and rerere_gc()
2011-05-13Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Libravatar Junio C Hamano1-0/+5
* js/maint-send-pack-stateless-rpc-deadlock-fix: send-pack: unbreak push over stateless rpc send-pack: avoid deadlock when pack-object dies early
2011-05-13Merge branch 'jh/dirstat-lines'Libravatar Junio C Hamano5-32/+1219
* jh/dirstat-lines: Mark dirstat error messages for translation Improve error handling when parsing dirstat parameters New --dirstat=lines mode, doing dirstat analysis based on diffstat Allow specifying --dirstat cut-off percentage as a floating point number Add config variable for specifying default --dirstat behavior Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file Make --dirstat=0 output directories that contribute < 0.1% of changes Add several testcases for --dirstat and friends
2011-05-13Merge branch 'jc/fix-add-u-unmerged'Libravatar Junio C Hamano2-39/+30
* jc/fix-add-u-unmerged: Fix "add -u" that sometimes fails to resolve unmerged paths
2011-05-13Merge branch 'jn/setup-revisions-glob-and-friends-passthru'Libravatar Junio C Hamano2-65/+122
* jn/setup-revisions-glob-and-friends-passthru: revisions: allow --glob and friends in parse_options-enabled commands revisions: split out handle_revision_pseudo_opt function
2011-05-13Merge branch 'cn/log-parse-opt'Libravatar Junio C Hamano1-30/+44
* cn/log-parse-opt: log: convert to parse-options
2011-05-13Merge branch 'maint'Libravatar Junio C Hamano2-2/+35
* maint: Prepare for 1.7.5.2 t5400: Fix a couple of typos Conflicts: RelNotes
2011-05-13Prepare for 1.7.5.2Libravatar Junio C Hamano2-1/+34
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-13Merge branch 'aw/maint-rebase-i-p-no-ff' into maintLibravatar Junio C Hamano2-2/+32
* aw/maint-rebase-i-p-no-ff: git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
2011-05-13Merge branch 'js/blame-parsename' into maintLibravatar Junio C Hamano3-3/+14
* js/blame-parsename: t/annotate-tests: Use echo & cat instead of sed blame: tolerate bogus e-mail addresses a bit better
2011-05-13Merge branch 'gr/cvsimport-alternative-cvspass-location' into maintLibravatar Junio C Hamano1-12/+41
* gr/cvsimport-alternative-cvspass-location: Look for password in both CVS and CVSNT password files.
2011-05-13Merge branch 'cj/p4merge' into maintLibravatar Junio C Hamano1-6/+3
* cj/p4merge: Pass empty file to p4merge where no base is suitable.
2011-05-13Merge branch 'jk/merge-one-file-working-tree' into maintLibravatar Junio C Hamano2-1/+106
* jk/merge-one-file-working-tree: merge-one-file: fix broken merges with alternate work trees add tests for merge-index / merge-one-file
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintLibravatar Junio C Hamano16-36/+120
* jc/fix-diff-files-unmerged: diff-files: show unmerged entries correctly diff: remove often unused parameters from diff_unmerge() diff.c: return filepair from diff_unmerge() test: use $_z40 from test-lib
2011-05-13Merge branch 'mz/maint-rename-unmerged' into maintLibravatar Junio C Hamano2-2/+67
* mz/maint-rename-unmerged: diffcore-rename: don't consider unmerged path as source
2011-05-13t5400: Fix a couple of typosLibravatar Johan Herland1-2/+2
Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-12Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano1-7/+7
* nd/struct-pathspec: Tweak t3102-ls-tree-wildcards to run on Windows
2011-05-12Tweak t3102-ls-tree-wildcards to run on WindowsLibravatar Johannes Sixt1-7/+7
The test case fails on Windows, because "a*" is an invalid file name. Therefore, use "a[a]" instead. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-11Update draft release notes to 1.7.6Libravatar Junio C Hamano1-3/+18
Signed-off-by: Junio C Hamano <gitster@pobox.com>