.gitignore - Issue 6246035: Merge remote branch 'cros/upstream' into master

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: .gitignore

Issue 6246035: Merge remote branch 'cros/upstream' into master (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: .gitignore

diff --git a/.gitignore b/.gitignore

index 355a9e31ca9e61e3d1d6d84a7af7760d25ab5eb4..ec559c1fd4dd968e67a146575be30f59c6df446a 100644

--- a/.gitignore

+++ b/.gitignore

@@ -20,6 +20,8 @@ tmp/

private_host_attributes_config.py

# default svn:ignore property:

+*.o

+#*#

.*.rej

*.rej

.*~

@@ -27,9 +29,13 @@ private_host_attributes_config.py

.#*

.DS_Store.

# additional patterns:

+*.pyc

client/control

client/results/

client/tests/kvm/images

client/tests/kvm/env

client/tmp

client/tests/kvm/*.cfg

+server/tmp

+tko/parsers/test/site_scenarios

+ExternalSource

« no previous file with comments | « no previous file | cli/atest » ('j') | cli/job.py » ('J')