development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-31 08:44:08 +00:00
Code Issues Projects Releases Packages Wiki Activity
30004 commits 6 branches 956 tags 487 MiB
Commit graph

341 commits

Author SHA1 Message Date
Junio C Hamano
be4d2920c2 Prepare for 1.7.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:27:14 -08:00
Junio C Hamano
55dcc2ebad Merge the attributes fix in from maint-1.6.7 branch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:24:01 -08:00
Junio C Hamano
804e97fc77 Prepare for 1.7.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:16:49 -08:00
Junio C Hamano
6c65b5ea43 Merge the attributes fix in from maint-1.6.6 branch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:14:26 -08:00
Junio C Hamano
f14f9803ef Prepare for 1.7.6.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 13:11:03 -08:00
Junio C Hamano
eac2d83247 Git 1.7.9-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-06 12:51:09 -08:00
Junio C Hamano
5de89d3abf Merge branch 'jc/show-sig' 
* jc/show-sig:
  log --show-signature: reword the common two-head merge case
  log-tree: show mergetag in log --show-signature output
  log-tree.c: small refactor in show_signature()
  commit --amend -S: strip existing gpgsig headers
  verify_signed_buffer: fix stale comment
  gpg-interface: allow use of a custom GPG binary
  pretty: %G[?GS] placeholders
  test "commit -S" and "log --show-signature"
  log: --show-signature
  commit: teach --gpg-sign option

Conflicts:
	builtin/commit-tree.c
	builtin/commit.c
	builtin/merge.c
	notes-cache.c
	pretty.c
 2012-01-06 12:44:07 -08:00
Junio C Hamano
21c6a18c75 Sync with 1.7.8.3 2012-01-06 12:42:48 -08:00
Junio C Hamano
5f4d133fca Git 1.7.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-06 12:41:39 -08:00
Junio C Hamano
17b4e93d5b Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-28 12:07:22 -08:00
Junio C Hamano
48de6569eb Sync with 1.7.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-28 12:04:25 -08:00
Junio C Hamano
f3f778df69 Git 1.7.8.2 
Contains accumulated fixes since 1.7.8 that have been merged to the
'master' branch in preparation for the 1.7.9 release.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-28 12:03:24 -08:00
Junio C Hamano
ec330158ec Update draft release notes in preparation for 1.7.9-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-22 15:36:48 -08:00
Junio C Hamano
5d6dfc7cb1 Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-22 11:43:02 -08:00
Junio C Hamano
e443bdfe1e Sync with v1.7.8.1 2011-12-21 12:02:44 -08:00
Junio C Hamano
2ce0edcd78 Git 1.7.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-21 12:02:13 -08:00
Junio C Hamano
876a6f4991 Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-19 16:39:54 -08:00
Junio C Hamano
ee22802493 Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-16 22:45:03 -08:00
Junio C Hamano
10f4eb652e Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 23:09:27 -08:00
Junio C Hamano
9e6324c4d7 Merge branch 'maint' 
* maint:
  Update draft release notes for 1.7.8.1
  Git 1.7.7.5
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf

Conflicts:
	RelNotes
 2011-12-13 22:18:00 -08:00
Junio C Hamano
7b6c5836cf Update draft release notes for 1.7.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 22:08:52 -08:00
Junio C Hamano
8311158c66 Merge branch 'maint-1.7.7' into maint 
* maint-1.7.7:
  Git 1.7.7.5
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf
  checkout,merge: loosen overwriting untracked file check based on info/exclude
  cast variable in call to free() in builtin/diff.c and submodule.c
  apply: get rid of useless x < 0 comparison on a size_t type

Conflicts:
	Documentation/git.txt
	GIT-VERSION-GEN
	RelNotes
	builtin/fetch.c
 2011-12-13 21:58:51 -08:00
Junio C Hamano
66c11f02b0 Git 1.7.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 21:55:31 -08:00
Junio C Hamano
7857e3246f Merge branch 'maint-1.7.6' into maint-1.7.7 
* maint-1.7.6:
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf

Conflicts:
	Documentation/git.txt
	GIT-VERSION-GEN
	RelNotes
 2011-12-13 21:44:56 -08:00
Junio C Hamano
15b7898c5e Git 1.7.6.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 21:32:30 -08:00
Junio C Hamano
9859a023fe Update draft release notes for 1.7.9 
The first two of more important topics slated for 1.7.9 have been merged.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-09 13:52:39 -08:00
Junio C Hamano
7e02a6c63a Kick-off the 1.7.9 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-05 15:49:34 -08:00
Junio C Hamano
406da78032 Git 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-02 10:02:52 -08:00
Junio C Hamano
fc14b89a7e Git 1.7.8-rc4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-28 14:07:22 -08:00
Junio C Hamano
017d1e1345 Update 1.7.8 draft release notes in preparation for rc4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-22 18:23:36 -08:00
Junio C Hamano
f56ef114ee Hopefully final update of release notes before 1.7.8 final 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-18 14:19:45 -08:00
Junio C Hamano
4c00c852b3 Sync with 1.7.7.4 2011-11-18 11:30:02 -08:00
Junio C Hamano
bd5bce7cbc Git 1.7.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-18 11:28:05 -08:00
Junio C Hamano
4d2440fe0d Git 1.7.8-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-17 11:06:15 -08:00
Junio C Hamano
bc1bbe0c19 Git 1.7.8-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-12 22:14:53 -08:00
Junio C Hamano
8a04247896 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-08 16:42:33 -08:00
Junio C Hamano
14ba45a2e6 Sync with 1.7.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-08 16:38:14 -08:00
Junio C Hamano
d4d5ab4727 Git 1.7.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-08 16:37:00 -08:00
Junio C Hamano
4cb6764227 Git 1.7.8-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-07 16:48:34 -08:00
Junio C Hamano
87bf9a7048 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-01 16:44:57 -07:00
Junio C Hamano
79eec363d2 Sync with 1.7.7.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-01 16:43:50 -07:00
Junio C Hamano
8d19b44b31 Git 1.7.7.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-01 16:41:57 -07:00
Junio C Hamano
be3fa9125e Git 1.7.8-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-30 19:14:24 -07:00
Junio C Hamano
e8e1c29021 Update draft release notes to 1.7.8 
Getting very close to -rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-27 12:06:44 -07:00
Junio C Hamano
425c771534 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-26 16:23:26 -07:00
Junio C Hamano
10b2a48113 Merge branch 'maint' 
* maint:
  Git 1.7.7.1
  RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting

Conflicts:
	GIT-VERSION-GEN
 2011-10-23 21:49:14 -07:00
Jonathan Nieder
7fe74f52f9 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting 
The change was actually about "git init -s" which sets the setgid bit on
SysV-style systems to allow shared access to a repository, and can provoke
errors on BSD-style systems, depending on how permissive the filesystem in
use wants to be.

More to the point, the patch was just taking a fix that arrived for
FreeBSD in v1.5.5 days and making it also apply to machines using an
(obscure) GNU userland/FreeBSD kernel mixture.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-23 21:16:31 -07:00
Junio C Hamano
e454a83fa2 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-21 16:05:42 -07:00
Junio C Hamano
8963314c77 Sync with maint 2011-10-21 11:24:34 -07:00
Junio C Hamano
8742218f21 Almost ready for 1.7.7.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-21 11:01:07 -07:00
Junio C Hamano
87009edcbd Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-19 11:02:13 -07:00
Junio C Hamano
08cfdbb88c Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-17 22:08:25 -07:00
Junio C Hamano
05f6edcd2a Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-16 10:58:35 -07:00
Junio C Hamano
288396994f Sync with maint 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-15 20:59:50 -07:00
Junio C Hamano
16b3b2d969 Prepare for 1.7.7.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-15 20:55:12 -07:00
Junio C Hamano
c9e7aa4f68 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-13 22:18:04 -07:00
Junio C Hamano
34c4461ae3 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-12 12:42:44 -07:00
Junio C Hamano
8b0e15fa95 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-10 16:14:59 -07:00
Junio C Hamano
7f41b6bbe3 Post 1.7.7 first wave 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-05 12:54:35 -07:00
Junio C Hamano
703f05ad58 Git 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-30 14:20:57 -07:00
Junio C Hamano
85e9c7e1d4 Git 1.7.7-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-23 15:35:57 -07:00
Junio C Hamano
b7619006eb Merge 1.7.6.4 in 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-23 15:31:08 -07:00
Junio C Hamano
6320526415 Git 1.7.6.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-23 14:43:05 -07:00
Junio C Hamano
167a5800cb Git 1.7.7-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-18 15:41:34 -07:00
Junio C Hamano
81a5bdd9c5 Sync with 1.7.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-12 10:43:17 -07:00
Junio C Hamano
740a8fc224 Git 1.7.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-12 10:33:40 -07:00
Junio C Hamano
2f9e2e7587 Merge branch 'maint' 
* maint:
  Prepare for 1.7.6.3 maintenance release
  SubmittingPathces: remove Cogito reference

Conflicts:
	RelNotes
 2011-09-11 22:35:11 -07:00
Junio C Hamano
c2d53586dd Prepare for 1.7.6.3 maintenance release 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-11 22:33:27 -07:00
Michael J Gruber
3793ac56b4 RelNotes/1.7.7: minor fixes 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-07 16:29:18 -07:00
Junio C Hamano
50963badbc Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-06 11:48:21 -07:00
Junio C Hamano
48f36dcd73 Sync with 1.7.6.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-06 11:42:12 -07:00
Junio C Hamano
509d59705e Git 1.7.6.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-06 11:41:02 -07:00
Junio C Hamano
b32128793d Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-02 13:26:02 -07:00
Junio C Hamano
e7734c6c9b Merge branch 'gb/maint-am-patch-format-error-message' 
* gb/maint-am-patch-format-error-message:
  am: format is in $patch_format, not parse_patch

Conflicts:
	git-am.sh
 2011-09-02 13:18:07 -07:00
Junio C Hamano
826603d118 Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-28 21:49:35 -07:00
Junio C Hamano
a452d148d1 Git 1.7.7-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-25 21:00:46 -07:00
Junio C Hamano
8d9185bc12 Update draft release notes to 1.7.7 2011-08-23 15:44:50 -07:00
Junio C Hamano
d0b46502de Merge branch 'maint' 
* maint:
  Update draft release notes for 1.7.6.1
 2011-08-23 15:29:08 -07:00
Junio C Hamano
b0b35a6ac3 Update draft release notes for 1.7.6.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-23 15:28:18 -07:00
Junio C Hamano
cee426811c Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-18 22:10:23 -07:00
Junio C Hamano
f85a051d13 Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-17 17:48:36 -07:00
Junio C Hamano
4bfe7cb666 Sync with "maint" 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-16 14:23:43 -07:00
Junio C Hamano
50b68aeb39 Merge branch 'maint' 
* maint:
  Prepare for 1.7.6.1
  am: refresh the index at start and --resolved

Conflicts:
	GIT-VERSION-GEN
	RelNotes
 2011-08-16 14:22:26 -07:00
Junio C Hamano
8499644ea7 Prepare for 1.7.6.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-16 12:42:17 -07:00
Junio C Hamano
b91766295f Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-11 12:12:22 -07:00
Junio C Hamano
5c2f84599c Update draft release notes to 1.7.7 
The third batch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-07-22 15:32:03 -07:00
Junio C Hamano
d79bcd6805 Update draft release notes to 1.7.7 
The second batch of topics for this cycle are now in.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-07-19 10:44:51 -07:00
Junio C Hamano
cf13f6ca40 Start 1.7.7 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-07-06 17:00:46 -07:00
Junio C Hamano
f696543dad Git 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-26 12:41:16 -07:00
Junio C Hamano
302bd999fd Git 1.7.6-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-16 09:21:36 -07:00
Junio C Hamano
2cbd969bcf Git 1.7.6-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-08 18:29:48 -07:00
Junio C Hamano
a6605d76cd Sync with 1.7.5.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-01 14:11:17 -07:00
Junio C Hamano
e5af0de202 Git 1.7.5.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-01 14:08:26 -07:00
Junio C Hamano
090a1a5d95 Update draft release notes to 1.7.6 
I think we are almost there for the feature freeze.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-31 12:22:50 -07:00
Junio C Hamano
2951df7a9a Sync with maint 2011-05-31 12:07:14 -07:00
Junio C Hamano
2b0b64ee85 Start 1.7.5.4 draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-31 12:06:40 -07:00
Junio C Hamano
665b051b90 Update 1.7.6 draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-26 10:41:33 -07:00
Junio C Hamano
1dcfb2ac65 Sync with 1.7.5.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-26 10:30:28 -07:00
Junio C Hamano
3c3e0b3c41 Git 1.7.5.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-26 10:29:29 -07:00
Junio C Hamano
5df3e2b3ca Update 1.7.6 draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-23 10:54:54 -07:00
Junio C Hamano
11bc3e92bf Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-19 21:02:20 -07:00
Junio C Hamano
b602ed7dea Update release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-16 17:19:24 -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
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
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
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
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
4e3aa87d13 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-06 11:13:08 -07:00
Junio C Hamano
505a138cbd Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-04 16:02:17 -07:00
Junio C Hamano
7ab576ce2d Sync with 1.7.5.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-04 15:49:04 -07:00
Junio C Hamano
2f312e8851 Git 1.7.5.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-04 15:47:40 -07:00
Junio C Hamano
0b9deecf62 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-02 16:10:50 -07:00
Junio C Hamano
791a765e54 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-01 16:29:43 -07:00
Junio C Hamano
1c08bf50cf Merge branch 'maint' 
* maint:
  Start 1.7.5.1 maintenance track
  git-send-email: fix missing space in error message

Conflicts:
	RelNotes
 2011-04-29 11:48:13 -07:00
Junio C Hamano
65f13f20bc Start 1.7.5.1 maintenance track 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-29 11:47:35 -07:00
Junio C Hamano
e839fe6c12 Start 1.7.6 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-27 12:09:04 -07:00
Junio C Hamano
6ceb270ce6 Git 1.7.5-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-19 11:51:00 -07:00
Junio C Hamano
0e73bb4dfc Sync with 1.7.4.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-19 11:49:13 -07:00
Junio C Hamano
4fec83045b Git 1.7.4.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-19 11:45:38 -07:00
Junio C Hamano
865d370c4d Git 1.7.5-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-13 14:02:00 -07:00
Junio C Hamano
6be0559183 Git 1.7.5-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-06 10:57:32 -07:00
Junio C Hamano
e38f2a88e5 Sync with 1.7.4.4 2011-04-06 10:51:30 -07:00
Junio C Hamano
5fb41b883a Git 1.7.4.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-06 10:50:00 -07:00
Junio C Hamano
44bc573436 Merge branch 'maint' 
* maint:
  Start preparing for 1.7.4.4
  pull: do not clobber untracked files on initial pull
  compat: add missing #include <sys/resource.h>

Conflicts:
	RelNotes
 2011-04-03 13:53:11 -07:00
Junio C Hamano
8e848868ff Start preparing for 1.7.4.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-03 12:58:23 -07:00
Junio C Hamano
cb35c0646d Update release notes 
As 1.7.4.3 has backmerged a handful of fixes from the master,
drop these entries from 1.7.5 release notes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-03 00:18:50 -07:00
Junio C Hamano
8f84c95fb2 Sync with 1.7.4.3 2011-04-03 00:14:16 -07:00
Junio C Hamano
d83a831bf4 Git 1.7.4.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-03 00:12:31 -07:00
Junio C Hamano
6acef04358 Git 1.7.5-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-31 13:58:47 -07:00
Junio C Hamano
be919d50c0 Update draft release note to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-26 20:17:15 -07:00
Junio C Hamano
421446b6fc Sync with 1.7.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-25 17:57:08 -07:00
Junio C Hamano
78bc466753 Git 1.7.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-25 17:56:14 -07:00
Junio C Hamano
5e839c8f6d Update draft release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-22 22:02:24 -07:00
Junio C Hamano
08c8d55813 Update drart release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-20 22:24:24 -07:00
Junio C Hamano
cdc34664d4 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.4.2
  Work around broken ln on solaris as used in t8006
  t/README: Add a note about running commands under valgrind
 2011-03-20 22:14:47 -07:00
Junio C Hamano
d98f24cd9d Update draft release notes to 1.7.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-20 22:14:21 -07:00
Michael J Gruber
a3ca9b0fbe RelNotes/1.7.5.txt: typo and language fixes 
Also remove entries for fixes that are already present in the
maintenance track.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-16 17:02:58 -07:00
Junio C Hamano
b2f6eab402 Merge branch 'maint' 
* maint:
  Prepare draft release notes to 1.7.4.2
  gitweb: highlight: replace tabs with spaces
  make_absolute_path: return the input path if it points to our buffer
  valgrind: ignore SSE-based strlen invalid reads
  diff --submodule: split into bite-sized pieces
  cherry: split off function to print output lines
  branch: split off function that writes tracking info and commit subject
  standardize brace placement in struct definitions
  compat: make gcc bswap an inline function
  enums: omit trailing comma for portability

Conflicts:
	RelNotes
 2011-03-16 16:59:30 -07:00
Junio C Hamano
fbcda3c0a7 Prepare draft release notes to 1.7.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-16 16:47:40 -07:00
Junio C Hamano
a62eafb0aa Update draft release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-15 15:17:54 -07:00
Junio C Hamano
83c3c6222a Update Release Notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-09 16:21:16 -08:00
Junio C Hamano
afb0b7933f Start preparing release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-02-28 12:28:20 -08:00
Junio C Hamano
9971d6d52c Git 1.7.4.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-02-11 14:39:55 -08:00
Junio C Hamano
7ed863a85a Git 1.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-30 19:02:37 -08:00
Junio C Hamano
630fc7878b Git 1.7.4-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-24 11:00:00 -08:00
Junio C Hamano
adf872e783 Git 1.7.4-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-13 12:14:18 -08:00
Michael J Gruber
3e70e37e72 RelNotes/1.7.4: minor fixes 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-13 11:32:39 -08:00
Junio C Hamano
685e9d9145 Git 1.7.4-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-05 14:57:19 -08:00
Junio C Hamano
8594495cd6 Merge branch 'maint' to sync with 1.7.3.5 2011-01-05 14:50:33 -08:00
Junio C Hamano
6e97ef31ce Git 1.7.3.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-05 14:49:19 -08:00
Ralf Wildenhues
469bfc962d Fix typos in the documentation 
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-04 11:23:42 -08:00
Junio C Hamano
01b97a4cb6 Git 1.7.4-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-28 13:53:24 -08:00
Junio C Hamano
2cd900fcf5 Merge branch 'maint' 
* maint:
  Prepare for 1.7.3.5
  Fix false positives in t3404 due to SHELL=/bin/false
  close file on error in read_mmfile()

Conflicts:
	RelNotes
 2010-12-28 13:50:11 -08:00
Junio C Hamano
17367939eb Prepare for 1.7.3.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-28 13:48:54 -08:00
Junio C Hamano
1b9743462d Update draft release notes to 1.7.4 
We are getting closer to -rc0 ;-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-16 21:43:08 -08:00
Junio C Hamano
15368e1836 Sync with 1.7.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 16:27:40 -08:00
Junio C Hamano
fa1c8542cb Git 1.7.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:47:40 -08:00
Junio C Hamano
b91779f17e Git 1.7.2.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:45:36 -08:00
Junio C Hamano
9db41eba42 Git 1.7.1.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:40:40 -08:00
Junio C Hamano
cb198b3b67 Git 1.7.0.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:38:19 -08:00
Junio C Hamano
abf411e28d Git 1.6.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:32:57 -08:00
Junio C Hamano
ec82874ad4 Git 1.6.5.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:27:41 -08:00
Junio C Hamano
88fcc52e44 Git 1.6.4.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:19:11 -08:00
Junio C Hamano
e6b71b3289 Merge branch 'maint' 
* maint:
  Prepare for 1.7.3.4
  use persistent memory for rejected paths
  do not overwrite files in leading path
  lstat_cache: optionally return match_len
  add function check_ok_to_remove()
  t7607: add leading-path tests
  t7607: use test-lib functions and check MERGE_HEAD
  Do not link with -lcrypto under NO_OPENSSL

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-14 08:58:09 -08:00
Junio C Hamano
ada6a4117e Prepare for 1.7.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-14 08:55:52 -08:00
Junio C Hamano
0d181cbb8a Merge branch 'jk/asciidoc-update' 
* jk/asciidoc-update:
  docs: default to more modern toolset
 2010-12-12 21:49:51 -08:00
Junio C Hamano
4443091d96 Relnotes: remove items fixed on 'maint' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-10 16:40:00 -08:00
Junio C Hamano
271c2aa6ee Merge branch 'maint' 2010-12-10 16:36:53 -08:00
Junio C Hamano
c6d059bbcc Prepare for 1.7.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-10 16:35:00 -08:00
Junio C Hamano
b281796eeb Merge branch 'maint' to sync with Git 1.7.3.3 
* maint:
  Git 1.7.3.3
  CodingGuidelines: mention whitespace preferences for shell scripts
  Documentation: do not misinterpret pull refspec as bold text

Conflicts:
	Documentation/git-pull.txt
	RelNotes
 2010-12-03 15:23:55 -08:00
Junio C Hamano
6079ec6680 Git 1.7.3.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-03 15:23:01 -08:00
Junio C Hamano
1c2ab43033 Update draft release notes to 1.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 14:33:26 -08:00
Junio C Hamano
2de3c142d3 Merge branch 'maint' 
* maint:
  Git 1.7.0.8
  Documentation: Fix mark-up of lines with more than one tilde

Conflicts:
	GIT-VERSION-GEN
 2010-12-02 14:32:52 -08:00
Junio C Hamano
7e4eb210bd Prepare for 1.7.3.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 14:31:17 -08:00
Junio C Hamano
2850c1a882 Git 1.7.2.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 14:28:01 -08:00
Junio C Hamano
bd01c6de67 Git 1.7.1.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 12:18:49 -08:00
Junio C Hamano
cbcab75c54 Git 1.7.0.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 12:13:27 -08:00
Jeff King
79c461d5b1 docs: default to more modern toolset 
When the ASCIIDOC8 and ASCIIDOC_NO_ROFF knobs were built,
many people were still on asciidoc 7 and using older
versions of docbook-xsl. These days, even the almost
2-year-old Debian stable needs these knobs turned.

So let's turn them by default. The new knobs ASCIIDOC7 and
ASCIIDOC_ROFF can be used to get the old behavior if people
are on older systems.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-24 15:13:58 -08:00
Junio C Hamano
d313c1cfe4 Update draft release notes to 1.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-17 16:43:14 -08:00
Junio C Hamano
d4c4369752 Sync with 1.7.3.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-10-21 17:16:10 -07:00
Junio C Hamano
8a90438506 Git 1.7.3.2 2010-10-21 17:14:32 -07:00
Junio C Hamano
9855b08d35 Start 1.7.4 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-29 15:26:17 -07:00
Junio C Hamano
92c1e71777 Git 1.7.3.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-29 10:39:53 -07:00
Junio C Hamano
87b50542a0 Git 1.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-18 14:55:08 -07:00
Junio C Hamano
7e100effc6 Git 1.7.3 rc2 2010-09-15 12:47:37 -07:00
Junio C Hamano
5b45c55545 Merge branch 'np/relnotes-in-subdir' 
* np/relnotes-in-subdir:
  install-webdoc: keep installed RelNotes-*.txt
  Documentation: move RelNotes into a directory of their own
 2010-09-10 11:54:58 -07:00
Nicolas Pitre
761e742d69 Documentation: move RelNotes into a directory of their own 
There are 108 of them already.  That's a bit more than one third of
all the files in the Documentation directory already, and still growing.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-06 17:41:18 -07:00