global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-04 05:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
21,050 Commits 6 Branches 1,001 Tags
0bbf529bc54f742d2ed73bf77ca0603346f04701
Commit Graph

21050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Sixt
0bbf529bc5 Merge branch 'master' of git://repo.or.cz/alt-git 2009-11-17 09:36:16 +01:00
Junio C Hamano
785c58e5c7 Update draft release notes to 1.6.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-11-16 00:07:48 -08:00
Junio C Hamano
78e0dbe772 Sync with 1.6.5.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-11-16 00:06:30 -08:00
Junio C Hamano
080cbc1275 Git 1.6.5.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
v1.6.5.3 		2009-11-16 00:05:12 -08:00
Junio C Hamano
c6b53c8684 Merge branch 'bs/maint-pre-commit-hook-sample' into maint 
* bs/maint-pre-commit-hook-sample:
  pre-commit.sample: Diff against the empty tree when HEAD is invalid
 2009-11-16 00:03:15 -08:00
Junio C Hamano
5e9cb8666b Merge branch 'jk/maint-add-p-empty' into maint 
* jk/maint-add-p-empty:
  add-interactive: handle deletion of empty files
 2009-11-16 00:02:44 -08:00
Junio C Hamano
d404a3e1a5 Merge branch 'js/maint-diff-color-words' into maint 
* js/maint-diff-color-words:
  diff --color-words: bit of clean-up
  diff --color-words -U0: fix the location of hunk headers
  t4034-diff-words: add a test for word diff without context

Conflicts:
	diff.c
 2009-11-16 00:01:56 -08:00
Junio C Hamano
ee16339d04 Merge branch 'tz/maint-rpm' into maint 
* tz/maint-rpm:
  Makefile: Ensure rpm packages can be read by older rpm versions
 2009-11-15 23:08:42 -08:00
Junio C Hamano
1f9d282bd1 Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint 
* jk/maint-format-patch-p-suppress-stat:
  format-patch: make "-p" suppress diffstat
 2009-11-15 23:07:49 -08:00
Junio C Hamano
3ad12436a0 Merge branch 'pb/maint-gitweb-blob-lineno' into maint 
* pb/maint-gitweb-blob-lineno:
  gitweb: Fix blob linenr links in pathinfo mode
 2009-11-15 23:07:38 -08:00
Junio C Hamano
958742ba43 Merge branch 'jk/maint-1.6.3-ls-files-i' into maint 
* jk/maint-1.6.3-ls-files-i:
  ls-files: unbreak "ls-files -i"
 2009-11-15 23:07:32 -08:00
Junio C Hamano
3e606ea7ca Merge branch 'vl/maint-openssl-signature-change' into maint 
* vl/maint-openssl-signature-change:
  imap-send.c: fix compiler warnings for OpenSSL 1.0
 2009-11-15 23:07:27 -08:00
Junio C Hamano
8d324bf890 Merge branch 'jk/maint-push-config' into maint 
* jk/maint-push-config:
  push: always load default config
 2009-11-15 23:07:17 -08:00
Junio C Hamano
061c4d0829 Merge branch 'sr/blame-incomplete' into maint 
* sr/blame-incomplete:
  blame: make sure that the last line ends in an LF
 2009-11-15 23:07:07 -08:00
Junio C Hamano
6dbdba00ea Merge branch 'jc/maint-blank-at-eof' into maint 
* jc/maint-blank-at-eof:
  diff -B: colour whitespace errors
  diff.c: emit_add_line() takes only the rest of the line
  diff.c: split emit_line() from the first char and the rest of the line
  diff.c: shuffling code around
  diff --whitespace: fix blank lines at end
  core.whitespace: split trailing-space into blank-at-{eol,eof}
  diff --color: color blank-at-eof
  diff --whitespace=warn/error: fix blank-at-eof check
  diff --whitespace=warn/error: obey blank-at-eof
  diff.c: the builtin_diff() deals with only two-file comparison
  apply --whitespace: warn blank but not necessarily empty lines at EOF
  apply --whitespace=warn/error: diagnose blank at EOF
  apply.c: split check_whitespace() into two
  apply --whitespace=fix: detect new blank lines at eof correctly
  apply --whitespace=fix: fix handling of blank lines at the eof
 2009-11-15 23:06:34 -08:00
Junio C Hamano
77097faa5d Merge branch 'maint' 
* maint:
 2009-11-15 16:41:42 -08:00
Junio C Hamano
2dfb96c9fc Merge branch 'bs/maint-pre-commit-hook-sample' 
* bs/maint-pre-commit-hook-sample:
  pre-commit.sample: Diff against the empty tree when HEAD is invalid
 2009-11-15 16:41:33 -08:00
Junio C Hamano
002a9ec005 Merge branch 'js/maint-diff-color-words' 
* js/maint-diff-color-words:
  diff --color-words: bit of clean-up
  diff --color-words -U0: fix the location of hunk headers
  t4034-diff-words: add a test for word diff without context

Conflicts:
	diff.c
 2009-11-15 16:41:29 -08:00
Junio C Hamano
934c042c9c Merge branch 'rs/pretty-wrap' 
* rs/pretty-wrap:
  log --format: don't ignore %w() at the start of format string
  Implement wrap format %w() as if it is a mode switch

Conflicts:
	pretty.c
 2009-11-15 16:41:17 -08:00
Junio C Hamano
7ef705eff6 Merge branch 'js/log-rewrap' 
* js/log-rewrap:
  Teach --wrap to only indent without wrapping
  Add strbuf_add_wrapped_text() to utf8.[ch]
  print_wrapped_text(): allow hard newlines
 2009-11-15 16:41:07 -08:00
Junio C Hamano
4d8c325888 Merge branch 'fc/doc-fast-forward' 
* fc/doc-fast-forward:
  Use 'fast-forward' all over the place

Conflicts:
	builtin-merge.c
 2009-11-15 16:41:02 -08:00
Junio C Hamano
9fa51ff940 Merge branch 'sc/difftool-p4merge' 
* sc/difftool-p4merge:
  mergetool--lib: add p4merge as a pre-configured mergetool option
 2009-11-15 16:40:50 -08:00
Junio C Hamano
3176bd0b0d Merge branch 'jk/maint-add-p-empty' 
* jk/maint-add-p-empty:
  add-interactive: handle deletion of empty files
 2009-11-15 16:40:46 -08:00
Junio C Hamano
578e5efd46 Merge branch 'lt/revision-bisect' 
* lt/revision-bisect:
  Add '--bisect' revision machinery argument
 2009-11-15 16:40:39 -08:00
Junio C Hamano
dd2195eb80 Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint 
* jc/maint-1.6.3-graft-trailing-space:
  info/grafts: allow trailing whitespaces at the end of line
 2009-11-15 16:38:47 -08:00
Junio C Hamano
69abb194ee Merge branch 'tr/maint-roff-quote' into maint 
* tr/maint-roff-quote:
  Quote ' as \(aq in manpages
 2009-11-15 16:38:36 -08:00
Junio C Hamano
f411c43e8a Merge branch 'ja/fetch-doc' into maint 
* ja/fetch-doc:
  Documentation/merge-options.txt: order options in alphabetical groups
  Documentation/git-pull.txt: Add subtitles above included option files
  Documentation/fetch-options.txt: order options alphabetically
 2009-11-15 16:38:18 -08:00
Junio C Hamano
077f3d405a Merge branch 'cb/doc-fetch-pull-merge' into maint 
* cb/doc-fetch-pull-merge:
  modernize fetch/merge/pull examples
 2009-11-15 16:37:58 -08:00
Junio C Hamano
04b3577535 Merge branch 'jk/maint-cvsimport-pathname' into maint 
* jk/maint-cvsimport-pathname:
  cvsimport: fix relative argument filenames
 2009-11-15 16:37:53 -08:00
Junio C Hamano
a25a2cd9eb Merge branch 'jc/receive-pack-auto' into maint 
* jc/receive-pack-auto:
  receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
  gc --auto --quiet: make the notice a bit less verboase
 2009-11-15 16:37:49 -08:00
Junio C Hamano
14d52b2815 Merge branch 'gb/maint-gitweb-esc-param' into maint 
* gb/maint-gitweb-esc-param:
  gitweb: fix esc_param
 2009-11-15 16:37:39 -08:00
Junio C Hamano
9453f8aa07 Merge branch 'jn/gitweb-patch' into maint 
* jn/gitweb-patch:
  gitweb: Do not show 'patch' link for merge commits
 2009-11-15 16:37:36 -08:00
Junio C Hamano
b7fba061e0 Merge branch 'maint' 
* maint:
  git-add.txt: fix formatting of --patch section
 2009-11-15 00:26:51 -08:00
Todd Zullinger
a96e9c286a Makefile: Ensure rpm packages can be read by older rpm versions 
The kernel.org hosts where the packages are built are now using Fedora
11, which defaults to sha256 for file digests instead of md5.  Older
versions of rpm can not handle these packages.  Tell rpmbuild to use md5
file digests for better compatibility.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-11-14 15:52:39 -08:00
Björn Gustavsson
9858b87fbb bash: add the merge option --ff-only 
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-11-14 15:34:37 -08:00
Stephen Boyd
46ada61ef1 git-add.txt: fix formatting of --patch section 
Extra paragraphs should be prefixed with a plus sign.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-11-14 00:26:37 -08:00
Junio C Hamano
d58f927c48 Merge branch 'maint' 
* maint:
  check-ref-format -h: it does not know the --print option yet

... but it does on the 'master' branch.
 2009-11-10 20:46:21 -08:00
Junio C Hamano
9deec58ad8 check-ref-format -h: it does not know the --print option yet 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-11-10 20:45:23 -08:00
Junio C Hamano
c5b3e0f549 git-describe.txt: formatting fix 
A multi-line SYNOPSIS description must be marked as [verse]

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-11-10 14:06:41 -08:00
Junio C Hamano
8ac7a77be6 Merge branch 'maint' 
* maint:
  merge: do not setup worktree twice
  check-ref-format: update usage string

Conflicts:
	builtin-check-ref-format.c
 2009-11-10 12:36:26 -08:00
Junio C Hamano
6a93158c33 Merge branch 'jk/maint-format-patch-p-suppress-stat' 
* jk/maint-format-patch-p-suppress-stat:
  format-patch: make "-p" suppress diffstat
 2009-11-10 12:35:56 -08:00
Junio C Hamano
a12e3cf3a2 Merge branch 'pb/maint-gitweb-blob-lineno' 
* pb/maint-gitweb-blob-lineno:
  gitweb: Fix blob linenr links in pathinfo mode
 2009-11-10 12:35:31 -08:00
Junio C Hamano
38d3d92c75 Merge branch 'tr/describe-advice' 
* tr/describe-advice:
  describe: when failing, tell the user about options that work
 2009-11-10 12:35:08 -08:00
Junio C Hamano
92396402e2 Merge branch 'jk/maint-1.6.3-ls-files-i' 
* jk/maint-1.6.3-ls-files-i:
  ls-files: unbreak "ls-files -i"
 2009-11-10 12:33:28 -08:00
Junio C Hamano
3cc335181f Merge branch 'bg/merge-ff-only' 
* bg/merge-ff-only:
  Teach 'git merge' and 'git pull' the option --ff-only
 2009-11-10 12:32:59 -08:00
Junio C Hamano
740b6ad75b Merge branch 'vl/maint-openssl-signature-change' 
* vl/maint-openssl-signature-change:
  imap-send.c: fix compiler warnings for OpenSSL 1.0
 2009-11-10 12:32:18 -08:00
Junio C Hamano
7b2ac7ee9e Merge branch 'jk/maint-push-config' 
* jk/maint-push-config:
  push: always load default config
 2009-11-10 12:31:42 -08:00
Junio C Hamano
af526de90c Merge branch 'jk/gitignore-anchored' 
* jk/gitignore-anchored:
  gitignore: root most patterns at the top-level directory

Conflicts:
	.gitignore
 2009-11-10 12:31:11 -08:00
Junio C Hamano
48cbf915a4 Merge branch 'jp/dirty-describe' 
* jp/dirty-describe:
  Teach "git describe" --dirty option
 2009-11-10 12:30:43 -08:00
Junio C Hamano
25dfd1b925 Merge branch 'sr/blame-incomplete' 
* sr/blame-incomplete:
  blame: make sure that the last line ends in an LF
 2009-11-10 12:29:53 -08:00