undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,422 Commits 1 Branch 0 Tags 217 MiB
0184435268
Commit Graph

25422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junio C Hamano
0184435268 Merge branch 'sg/completion-updates' 
* 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-16 16:47:00 -07:00
Junio C Hamano
8cee0f1d8a Merge branch 'kk/maint-prefix-in-config-mak' 
* 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-16 16:46:53 -07:00
Junio C Hamano
36a45b4fa4 Merge branch 'mg/merge-ff-config' 
* 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-16 16:46:23 -07:00
Junio C Hamano
6c7471bcf1 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.5.2
  Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
 2011-05-16 16:44:57 -07:00
Junio C Hamano
ea1ab4b280 Update draft release notes to 1.7.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-16 16:44:50 -07:00
Junio C Hamano
4bbfd8e3da Merge branch 'jn/maint-format-patch-doc' into maint 
* jn/maint-format-patch-doc:
  Documentation: describe the format of messages with inline patches
 2011-05-16 16:39:09 -07:00
Junio C Hamano
0f51322a6b 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"
 2011-05-16 16:38:56 -07:00
Junio C Hamano
8de4338650 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
 2011-05-16 16:38:46 -07:00
Junio C Hamano
f7045912f8 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
 2011-05-16 16:38:16 -07:00
Junio C Hamano
a8793d2178 Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint 
* jc/t1506-shell-param-expansion-gotcha:
  t1507: avoid "${parameter<op>'word'}" inside double-quotes
 2011-05-16 16:37:54 -07:00
Junio C Hamano
90e8b9b23d 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
 2011-05-16 16:37:33 -07:00
Junio C Hamano
81f90684bf 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
 2011-05-16 16:37:12 -07:00
Junio C Hamano
2f0db1d86b 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
 2011-05-16 16:37:07 -07:00
Junio C Hamano
c69e8b6935 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
 2011-05-16 16:36:46 -07:00
Jim Meyering
43d532e6ba 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>
 2011-05-16 16:35:08 -07:00
Junio C Hamano
c565cb452c Sync release notes for 1.7.6 to exclude what are in maintenance track 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-15 16:19:16 -07:00
Junio C Hamano
f574cb3404 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.5.2
  git_open_noatime(): drop unused parameter
  sha1_file: typofix
 2011-05-15 16:16:56 -07:00
Junio C Hamano
96dbe93da5 Update draft release notes to 1.7.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-15 16:11:55 -07:00
Junio C Hamano
06c0f42f94 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
 2011-05-15 16:10:49 -07:00
Junio C Hamano
ab02095ccd Merge branch 'jm/mergetool-submodules' into maint 
* jm/mergetool-submodules:
  mergetool: Teach about submodules
 2011-05-15 15:57:16 -07:00
Junio C Hamano
92b501f2a0 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
 2011-05-15 15:56:44 -07:00
Junio C Hamano
e5c1650b27 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
 2011-05-15 15:52:40 -07:00
Junio C Hamano
f4e516834e 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>
 2011-05-15 15:24:52 -07:00
Junio C Hamano
ccf5ace0dc sha1_file: typofix 
The number zero is spelled "zero", not "zer0".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-15 15:24:36 -07:00
Junio C Hamano
2f80de956f Merge branch 'maint' 
* maint:
  add, merge, diff: do not use strcasecmp to compare config variable names
 2011-05-14 20:44:09 -07:00
Jonathan Nieder
8c2be75fe1 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>
 2011-05-14 18:53:39 -07:00
Junio C Hamano
2de58b398b Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-13 11:14:07 -07:00
Junio C Hamano
e4ae6efb78 Merge branch 'bf/commit-template-no-cleanup' 
* bf/commit-template-no-cleanup:
  Do not strip empty lines / trailing spaces from a commit message template
 2011-05-13 11:03:08 -07:00
Junio C Hamano
d6ad4ff120 Merge branch 'jc/t1506-shell-param-expansion-gotcha' 
* jc/t1506-shell-param-expansion-gotcha:
  t1507: avoid "${parameter<op>'word'}" inside double-quotes
 2011-05-13 11:02:47 -07:00
Junio C Hamano
ad29f71d53 Merge branch 'rr/rerere-libify-clear-gc' 
* rr/rerere-libify-clear-gc:
  rerere: libify rerere_clear() and rerere_gc()
 2011-05-13 11:02:40 -07:00
Junio C Hamano
e9c1a3a426 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' 
* 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-13 11:02:29 -07:00
Junio C Hamano
df54e2bfd6 Merge branch 'jh/dirstat-lines' 
* 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-13 11:01:32 -07:00
Junio C Hamano
f7d59e2568 Merge branch 'jc/fix-add-u-unmerged' 
* jc/fix-add-u-unmerged:
  Fix "add -u" that sometimes fails to resolve unmerged paths
 2011-05-13 11:01:15 -07:00
Junio C Hamano
3e1a363b1f Merge branch 'jn/setup-revisions-glob-and-friends-passthru' 
* 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-13 11:00:25 -07:00
Junio C Hamano
2f3e3f573d Merge branch 'cn/log-parse-opt' 
* cn/log-parse-opt:
  log: convert to parse-options
 2011-05-13 10:59:57 -07:00
Junio C Hamano
32341b9df5 Merge branch 'maint' 
* maint:
  Prepare for 1.7.5.2
  t5400: Fix a couple of typos

Conflicts:
	RelNotes
 2011-05-13 10:58:10 -07:00
Junio C Hamano
375f8a032e Prepare for 1.7.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-13 10:57:09 -07:00
Junio C Hamano
e31b018372 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
 2011-05-13 10:45:21 -07:00
Junio C Hamano
bc67ad8c37 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
 2011-05-13 10:45:00 -07:00
Junio C Hamano
978471dcce Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint 
* gr/cvsimport-alternative-cvspass-location:
  Look for password in both CVS and CVSNT password files.
 2011-05-13 10:44:54 -07:00
Junio C Hamano
e82c74618b Merge branch 'cj/p4merge' into maint 
* cj/p4merge:
  Pass empty file to p4merge where no base is suitable.
 2011-05-13 10:44:46 -07:00
Junio C Hamano
8272bcabac 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
 2011-05-13 10:44:19 -07:00
Junio C Hamano
a613b534bc 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
 2011-05-13 10:41:54 -07:00
Junio C Hamano
4bdbfb15b2 Merge branch 'mz/maint-rename-unmerged' into maint 
* mz/maint-rename-unmerged:
  diffcore-rename: don't consider unmerged path as source
 2011-05-13 10:41:24 -07:00
Johan Herland
ebe8621fd7 t5400: Fix a couple of typos 
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-13 09:57:16 -07:00
Junio C Hamano
240fe0505f Merge branch 'nd/struct-pathspec' 
* nd/struct-pathspec:
  Tweak t3102-ls-tree-wildcards to run on Windows
 2011-05-12 22:36:41 -07:00
Johannes Sixt
145f86a009 Tweak t3102-ls-tree-wildcards to run on Windows 
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-12 22:35:47 -07:00
Junio C Hamano
dbe9c5adf9 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-11 11:56:11 -07:00
Junio C Hamano
a5794988dd Merge branch 'jn/gitweb-dependency' 
* jn/gitweb-dependency:
  Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
  git-instaweb: Simplify build dependency on gitweb
 2011-05-11 11:38:39 -07:00
Junio C Hamano
c7fe5b61e1 Merge branch 'jc/maint-branch-mergeoptions' 
* jc/maint-branch-mergeoptions:
  merge: make branch.<name>.mergeoptions correctly override merge.<option>

Conflicts:
	builtin/merge.c
 2011-05-11 11:38:36 -07:00