maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity
228,235 Commits 23 Branches 0 Tags 2.2 GiB
Commit Graph

5 Commits

Author SHA1 Message Date
Dimitry Andric 96ace11d11 Remove bashism from merge.sh: POSIX sh does not have the `function` 
reserved word, and it is even superfluous in bash, for this particular
instance.

llvm-svn: 257663
 2016-01-13 19:48:50 +00:00
Hans Wennborg 9da51807ee Add a -revert option to utils/release/merge.sh 
llvm-svn: 243929
 2015-08-04 00:47:58 +00:00
Hans Wennborg 427e1214b4 Release merge script: don't actually commit the merge 
Instead, just present the command for committing it. This way,
the user can test the merge locally, resolve conflicts, etc.
before committing, which seems much safer to me.

llvm-svn: 225737
 2015-01-13 00:07:31 +00:00
Bill Wendling ef22c60abd Update the tree before applying patch. 
llvm-svn: 142155
 2011-10-16 20:59:25 +00:00
Bill Wendling 90f98e704d Add a script that helps merge changes into a release branch. 
llvm-svn: 142097
 2011-10-16 01:54:03 +00:00