1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Junio C Hamano
Git 1.7.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.5.2
Jonathan Nieder
provide a copy of the LGPLv2.1 The LGPL seems to require providing a copy of the license when distributing xdiff, compat/fnmatch, and so on, or altering the license notices to refer to the GPL intead. Since we don't want to do the latter, let's do the former. It's nice to let people know their rights anyway. Inspired-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: J…
Junio C Hamano
Update draft release notes to 1.7.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jn/maint-format-patch-doc' into maint * jn/maint-format-patch-doc: Documentation: describe the format of messages with inline patches
Junio C Hamano
Merge branch 'ss/cherry-pick-x-doc' into maint * ss/cherry-pick-x-doc: doc: Clarify that "cherry-pick -x" does not use "git notes"
Junio C Hamano
Merge branch 'vr/merge-base-doc' into maint * vr/merge-base-doc: Restructure documentation for git-merge-base. Documentation: update to git-merge-base --octopus
Junio C Hamano
Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maint * sr/maint-fast-import-tighten-option-parsing: fast-import: fix option parser for no-arg options
Junio C Hamano
Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint * jc/t1506-shell-param-expansion-gotcha: t1507: avoid "${parameter<op>'word'}" inside double-quotes
Junio C Hamano
Merge branch 'jc/fix-add-u-unmerged' into maint * jc/fix-add-u-unmerged: Fix "add -u" that sometimes fails to resolve unmerged paths Conflicts: builtin/add.c
Junio C Hamano
Merge branch 'jn/gitweb-dependency' into maint * jn/gitweb-dependency: Remove gitweb/gitweb.cgi and other legacy targets from main Makefile git-instaweb: Simplify build dependency on gitweb
Junio C Hamano
Merge branch 'jc/maint-branch-mergeoptions' into maint * jc/maint-branch-mergeoptions: merge: make branch.<name>.mergeoptions correctly override merge.<option> Conflicts: builtin/merge.c
Junio C Hamano
Merge branch 'jc/maint-add-p-overlapping-hunks' into maint * 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
Jim Meyering
Documentation/git-fsck.txt: fix typo: unreadable -> unreachable Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.7.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'cn/format-patch-quiet' into maint * cn/format-patch-quiet: format-patch: document --quiet option format-patch: don't pass on the --quiet flag
Junio C Hamano
Merge branch 'jm/mergetool-submodules' into maint * jm/mergetool-submodules: mergetool: Teach about submodules
Junio C Hamano
Merge branch 'jk/format-patch-quote-special-in-from' into maint * jk/format-patch-quote-special-in-from: pretty: quote rfc822 specials in email addresses
Junio C Hamano
Merge branch 'vh/git-svn-doc' into maint * 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
Junio C Hamano
git_open_noatime(): drop unused parameter 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>
Junio C Hamano
sha1_file: typofix The number zero is spelled "zero", not "zer0". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder
add, merge, diff: do not use strcasecmp to compare config variable names 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>
Junio C Hamano
Prepare for 1.7.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint * aw/maint-rebase-i-p-no-ff: git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
Junio C Hamano
Merge branch 'js/blame-parsename' into maint * js/blame-parsename: t/annotate-tests: Use echo & cat instead of sed blame: tolerate bogus e-mail addresses a bit better
Junio C Hamano
Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint * gr/cvsimport-alternative-cvspass-location: Look for password in both CVS and CVSNT password files.
Junio C Hamano
Merge branch 'cj/p4merge' into maint * cj/p4merge: Pass empty file to p4merge where no base is suitable.
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree' into maint * jk/merge-one-file-working-tree: merge-one-file: fix broken merges with alternate work trees add tests for merge-index / merge-one-file
Junio C Hamano
Merge branch 'jc/fix-diff-files-unmerged' into maint * 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
Junio C Hamano
Merge branch 'mz/maint-rename-unmerged' into maint * mz/maint-rename-unmerged: diffcore-rename: don't consider unmerged path as source
Johan Herland
t5400: Fix a couple of typos Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next