HomeSort by relevance Sort by last modified time
    Searched refs:GIT (Results 1 - 2 of 2) sorted by null

  /external/webkit/WebKitTools/Scripts/
resolve-ChangeLogs 29 # Merge and resolve ChangeLog conflicts for svn and git repositories
63 my $GIT = "git";
92 print STDERR "ERROR: --continue may only be used with a git repository\n";
95 print STDERR "ERROR: --fix-merged may only be used with a git repository\n";
103 -c|--[no-]continue run "git rebase --continue" after fixing ChangeLog
105 -f|--fix-merged [revision-range] fix git-merged ChangeLog entries; if a revision-range
106 is specified, run git filter-branch on the range
136 print "Unmerged files; skipping '$GIT rebase --continue'.\n";
138 print "Running '$GIT rebase --continue'...\n"
    [all...]
prepare-ChangeLog 32 # Git support added by Adam Roben <aroben@apple.com>
33 # --git-index flag added by Joe Mason <joe.mason@torchmobile.com>
117 "git-commit:s" => \$gitCommit,
118 "git-index" => \$gitIndex,
119 "git-reviewer:s" => \$gitReviewer,
125 print STDERR basename($0) . " [--bug] [-d|--diff] [-h|--help] [-o|--open] [--git-commit=<committish>] [--git-reviewer=<name>] [svndir1 [svndir2 ...]]\n";
128 print STDERR " --git-commit Populate the ChangeLogs from the specified git commit\n";
129 print STDERR " --git-index Populate the ChangeLogs from the git index only\n"
    [all...]

Completed in 163 milliseconds