Revision 8582
Added by ben leinfelder almost 11 years ago
| build.xml | ||
|---|---|---|
| 72 | 72 |
<arg value = "@{dest}" />
|
| 73 | 73 |
</args> |
| 74 | 74 |
</git> |
| 75 |
<git command = "pull" dir = "@{dest}" >
|
|
| 75 |
<git command = "checkout" dir = "@{dest}">
|
|
| 76 | 76 |
<args> |
| 77 |
<arg value = "@{repository}" />
|
|
| 78 | 77 |
<arg value = "@{refname}" />
|
| 79 | 78 |
</args> |
| 80 | 79 |
</git> |
| 81 |
<git command = "checkout" dir = "@{dest}">
|
|
| 80 |
<git command = "pull" dir = "@{dest}" >
|
|
| 82 | 81 |
<args> |
| 82 |
<arg value = "@{repository}" />
|
|
| 83 | 83 |
<arg value = "@{refname}" />
|
| 84 | 84 |
</args> |
| 85 | 85 |
</git> |
Also available in: Unified diff
swap git command order to avoid merge conflict messages.