mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-03 23:14:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  templates/Makefile: don't depend on local umask setting
  Correct name of diff_flush() in API documentation
  Start preparing for 1.5.4.4

Conflicts:

	RelNotes
This commit is contained in:
Junio C Hamano 2008-02-29 00:00:09 -08:00
commit 25c4f61c51
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/RelNotes-1.5.4.4.txt Normal file
View File

@ -0,0 +1,26 @@
GIT v1.5.4.4 Release Notes
==========================
Fixes since v1.5.4.3
--------------------
* "git cvsexportcommit -w $cvsdir" misbehaved when GIT_DIR is set to a
relative directory.
* "git http-push" had an invalid memory access that could lead it to
segfault.
* When "git rebase -i" gave control back to the user for a commit that is
marked to be edited, it just said "modify it with commit --amend",
without saying what to do to continue after modifying it. Give an
explicit instruction to run "rebase --continue" to be more helpful.
* "git send-email" in 1.5.4.3 issued a bogus empty In-Reply-To: header.
Also included are a handful documentation updates.
---
exec >/var/tmp/1
echo O=$(git describe maint)
O=v1.5.4.3
git shortlog --no-merges $O..maint

2
Documentation/technical/api-diff.txt
View File

@ -39,7 +39,7 @@ Calling sequence
* Once you finish feeding the pairs of files, call `diffcore_std()`.
This will tell the diffcore library to go ahead and do its work.
* Calling `diffcore_flush()` will produce the output.
* Calling `diff_flush()` will produce the output.
Data structures

6
templates/Makefile
View File

@ -29,10 +29,10 @@ boilerplates.made : $(bpsrc)
case "$$boilerplate" in *~) continue ;; esac && \
dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \
dir=`expr "$$dst" : '\(.*\)/'` && \
mkdir -p blt/$$dir && \
$(INSTALL) -d -m 755 blt/$$dir && \
case "$$boilerplate" in \
*--) ;; \
*) cp $$boilerplate blt/$$dst ;; \
*) cp -p $$boilerplate blt/$$dst ;; \
esac || exit; \
done && \
date >$@
@ -48,4 +48,4 @@ clean:
install: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_dir_SQ)'
(cd blt && $(TAR) cf - .) | \
(cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)
(cd '$(DESTDIR_SQ)$(template_dir_SQ)' && umask 022 && $(TAR) xf -)