diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
| commit | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (patch) | |
| tree | 81db9e5f919b84dcb4284ca8cdf675e13716c191 /scripts/setlocalversion | |
| parent | 9979ead5d1eb23191a00453559927c5abf9087e2 (diff) | |
| parent | 4f0210b9c4889eede9f8f379f93570c01998ccb9 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Fix up some trivial conflicts in {i386|ia64}/Makefile
Diffstat (limited to 'scripts/setlocalversion')
| -rw-r--r-- | scripts/setlocalversion | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index f54dac88cfd..9a23825218f 100644 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion | |||
| @@ -17,6 +17,6 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then | |||
| 17 | 17 | ||
| 18 | # Are there uncommitted changes? | 18 | # Are there uncommitted changes? |
| 19 | if git diff-files | read dummy; then | 19 | if git diff-files | read dummy; then |
| 20 | printf '%s' -git_dirty | 20 | printf '%s' -dirty |
| 21 | fi | 21 | fi |
| 22 | fi | 22 | fi |