HomeSort by relevance Sort by last modified time
    Searched full:rebase (Results 1 - 25 of 42) sorted by null

1 2

  /external/chromium_org/chrome/test/functional/media/
audio_playback_perf.py 65 # Rebase test expectation file is REBASE=1 env variable is set.
66 rebase = 'REBASE' in os.environ
79 file_no_silence = _TEST_EXPECTED_AUDIO if rebase else GetTempFilename()
82 # Exit if we just want to rebase expected output.
83 if rebase:
98 if not rebase and file_no_silence:
  /external/llvm/utils/git-svn/
git-svnup 12 git svn rebase -l
  /external/chromium_org/tools/json_schema_compiler/
dart_generator_test.py 14 # If --rebase is passed to this test, this is set to True, indicating the test
81 if '--rebase' in sys.argv:
82 print "Running in rebase mode."
84 sys.argv.remove('--rebase')
  /external/chromium_org/third_party/mesa/src/docs/
repository.html 154 working on a separate branch and would rebase your branch prior to
157 you also need to use the rebase feature in order to avoid an
187 git pull --rebase
201 If the rebase resulted in conflicts or changes that could affect
206 If you want the rebase action to be the default action, then
208 git config branch.master.rebase true
  /external/mesa3d/docs/
repository.html 154 working on a separate branch and would rebase your branch prior to
157 you also need to use the rebase feature in order to avoid an
187 git pull --rebase
201 If the rebase resulted in conflicts or changes that could affect
206 If you want the rebase action to be the default action, then
208 git config branch.master.rebase true
  /external/chromium_org/chrome/test/functional/
webrtc_audio_quality.py 81 from known distortions such as comfort noise. You can do such a rebase on
82 the _REFERENCE_FILE by setting REBASE=1 before running the test. The file
149 rebase = 'REBASE' in os.environ
173 if file_no_silence and not rebase:
  /docs/source.android.com/src/source/
submit-patches.jd 112 <p>If other patches are submitted to the source tree that conflict with yours, you will need to rebase your patch on top of the new HEAD of the source repository. The easy way to do this is to run</p>
115 <p>This command first fetches the updates from the source server, then attempts to automatically rebase your HEAD onto the new remote HEAD.</p>
116 <p>If the automatic rebase is unsuccessful, you will have to perform a manual rebase.</p>
117 <pre><code>$ git rebase master
119 <p>Using <code>git mergetool</code> may help you deal with the rebase conflict. Once you have successfully merged the conflicting files,</p>
120 <pre><code>$ git rebase --continue
122 <p>After either automatic or manual rebase is complete, run <code>repo upload</code> to submit your rebased patch.</p>
using-repo.jd 67 git rebase origin/BRANCH
72 <p>If the git rebase operation results in merge conflicts, you will need to use the normal Git commands (for example, <code>git rebase --continue</code>) to resolve the conflicts.</p>
100 single commit, use git rebase -i before you run repo upload.</p>
102 <p>To make edits to changes after they have been uploaded, you should use a tool like <code>git rebase -i</code> or <code>git commit --amend</code> to update your local commits. After your edits are complete:</p>
developing.jd 134 <p>Change into the relevant project directory, run <code>git add</code> and <code>git commit</code> for the files in question, and then "rebase" the changes. For example:</p>
137 $ git rebase --continue
141 <p>When the rebase is complete start the entire sync again:</p>
  /external/chromium_org/third_party/mesa/src/src/mesa/vbo/
vbo_rebase.c 56 #define REBASE(TYPE) \
72 REBASE(GLuint)
73 REBASE(GLushort)
74 REBASE(GLubyte)
vbo_split_inplace.c 80 /* Rebase the primitives to save index buffer entries. */
  /external/mesa3d/src/mesa/vbo/
vbo_rebase.c 56 #define REBASE(TYPE) \
72 REBASE(GLuint)
73 REBASE(GLushort)
74 REBASE(GLubyte)
vbo_split_inplace.c 80 /* Rebase the primitives to save index buffer entries. */
  /external/chromium_org/chrome/common/extensions/docs/server2/
api_data_source_test.py 106 # TODO(kalman): re-enable this when we have a rebase option.
  /ndk/sources/cxx-stl/llvm-libc++/tools/
upgrade-upstream.sh 184 run git rebase revision-$NEW_REVISION
  /external/chromium_org/chrome/browser/prerender/
prerender_tab_helper.cc 296 // rebase the start time to now.
  /external/llvm/docs/
GettingStarted.rst 563 pull --rebase`` instead of ``git pull`` to avoid generating a non-linear history
564 in your clone. To configure ``git pull`` to pass ``--rebase`` by default on the
569 % git config branch.master.rebase true
636 % git svn rebase -l # -l avoids fetching ahead of the git mirror.
644 % git svn rebase -l
655 % git svn rebase -l
658 git svn rebase -l)
663 ``checkout`` each working branch individually and ``rebase`` it on top of its
689 On success, ``dcommit`` will rebase against the HEAD of SVN, so to avoid conflict,
690 please make sure your current branch is up-to-date (via fetch/rebase) befor
    [all...]
  /external/chromium_org/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/
git.py 145 return self._filesystem.exists(self.absolute_path(self._filesystem.join('.git', 'rebase-apply')))
153 # Aborting rebase even though this does not match subversion
155 self._run_git(['rebase', '--abort'])
scm_unittest.py     [all...]
  /external/chromium_org/third_party/angle_dx11/extensions/
ANGLE_framebuffer_multisample.txt 357 - rebase changes against the Open GL ES 2.0 specification
  /external/chromium_org/third_party/mesa/src/src/gallium/drivers/nouveau/
nouveau_buffer.c 509 * We'd like to only allocate @size bytes here, but then we'd have to rebase
  /external/chromium_org/third_party/mesa/src/src/mesa/tnl/
t_draw.c 502 * will rebase the elements to the basevertex, and we'll only
  /external/chromium_org/v8/tools/
push-to-trunk.sh 231 # Instead of relying on "git rebase -i", we'll just create a diff, because
  /external/mesa3d/src/gallium/drivers/nouveau/
nouveau_buffer.c 509 * We'd like to only allocate @size bytes here, but then we'd have to rebase
  /external/mesa3d/src/mesa/tnl/
t_draw.c 502 * will rebase the elements to the basevertex, and we'll only

Completed in 1244 milliseconds

1 2