merged
authorOleksandr Gavenko <gavenkoa@gmail.com>
Sun, 20 Feb 2011 21:11:47 +0200
changeset 122 0933354b531d
parent 118 2306b12ff466 (diff)
parent 121 e9106b2d67fb (current diff)
child 123 05fbac105c1d
merged
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitconfig	Sun Feb 20 21:11:47 2011 +0200
@@ -0,0 +1,53 @@
+# -*- mode: conf -*-
+
+[user]
+name = Oleksandr Gavenko
+email = gavenkoa@gmail.com
+
+[alias]
+br = branch
+ci = commit -a
+co = checkout
+cp = cherry-pick
+graph = log --graph --oneline --decorate
+info = config --list
+pop = !git stash apply && git stash clear
+sb = show-branch
+st = status
+staged = diff --cached
+summary = log --oneline
+tags = tag -n1 -l
+w = whatchanged
+
+[core]
+whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
+excludesfile = ~/.gitignore
+
+[apply]
+# fix/strip/nowarn
+# whitespace = strip
+
+[diff]
+color = auto
+# Makes the diff much shorter when moving or copying files.
+rename = copy
+
+# The number of files to consider when performing the copy/rename
+# detection; equivalent to the git diff option -l.
+# renamelimit = 0
+
+[pager]
+color = true
+
+[status]
+color = auto
+
+[color]
+branch = auto
+diff = auto
+interactive = auto
+status = auto
+
+pager = true
+ui = true
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitignore	Sun Feb 20 21:11:47 2011 +0200
@@ -0,0 +1,13 @@
+# See: man 5 gitignore.
+
+*.a
+*.elc
+*.exe
+*.dll
+*.ocx
+*.lib
+*.o
+*.obj
+*.py[co]
+*.so
+*~
--- a/.hgrc	Sun Jan 02 13:27:14 2011 +0200
+++ b/.hgrc	Sun Feb 20 21:11:47 2011 +0200
@@ -1,7 +1,9 @@
 ; -*- mode: ini-generic; coding: utf-8 -*-
 
 [ui]
+; Who are you?
 username = Oleksandr Gavenko <gavenkoa@gmail.com>
+; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file.
 merge = internal:merge
 editor = emacs -q
 
@@ -14,24 +16,14 @@
 encoding = utf-8
 
 [extensions]
-; For old Mercurial.
-; fetch =
+; To allow 'fetch' command.
 hgext.fetch =
+; To allow Mercurial Queues.
 hgext.mq =
+; To import revisions from foreign VCS repositories into Mercurial.
 hgext.convert =
 ; Usage:  hg glog <dir>
 hgext.graphlog =
-; hgext.win32text =
+; Enable '.hgeol' tracking (fix for CR/LF).
+hgext.eol =
 
-; [encode]
-; **.py = cleverencode:
-; **.c = cleverencode:
-; **.h = cleverencode:
-; **.java = cleverencode:
-; **.txt = cleverencode:
-; [decode]
-; **.py = cleverdecode:
-; **.c = cleverdecode:
-; **.h = cleverdecode:
-; **.java = cleverdecode:
-; **.txt = cleverdecode:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.subversion/config	Sun Feb 20 21:11:47 2011 +0200
@@ -0,0 +1,143 @@
+### This file configures various client-side behaviors.
+###
+### The commented-out examples below are intended to demonstrate
+### how to use this file.
+
+### Section for authentication and authorization customizations.
+[auth]
+### Set password stores used by Subversion. They should be
+### delimited by spaces or commas. The order of values determines
+### the order in which password stores are used.
+### Valid password stores:
+###   gnome-keyring        (Unix-like systems)
+###   kwallet              (Unix-like systems)
+###   keychain             (Mac OS X)
+###   windows-cryptoapi    (Windows)
+# password-stores = windows-cryptoapi
+###
+### The rest of this section in this file has been deprecated.
+### Both 'store-passwords' and 'store-auth-creds' can now be
+### specified in the 'servers' file in your config directory.
+### Anything specified in this section is overridden by settings
+### specified in the 'servers' file.
+###
+### Set store-passwords to 'no' to avoid storing passwords in the
+### auth/ area of your config directory.  It defaults to 'yes',
+### but Subversion will never save your password to disk in
+### plaintext unless you tell it to (see the 'servers' file).
+### Note that this option only prevents saving of *new* passwords;
+### it doesn't invalidate existing passwords.  (To do that, remove
+### the cache files by hand as described in the Subversion book.)
+# store-passwords = no
+### Set store-auth-creds to 'no' to avoid storing any subversion
+### credentials in the auth/ area of your config directory.
+### It defaults to 'yes'.  Note that this option only prevents
+### saving of *new* credentials;  it doesn't invalidate existing
+### caches.  (To do that, remove the cache files by hand.)
+# store-auth-creds = no
+
+### Section for configuring external helper applications.
+[helpers]
+### Set editor-cmd to the command used to invoke your text editor.
+###   This will override the environment variables that Subversion
+###   examines by default to find this information ($EDITOR, 
+###   et al).
+# editor-cmd = editor (vi, emacs, notepad, etc.)
+### Set diff-cmd to the absolute path of your 'diff' program.
+###   This will override the compile-time default, which is to use
+###   Subversion's internal diff implementation.
+# diff-cmd = diff_program (diff, gdiff, etc.)
+### Set diff3-cmd to the absolute path of your 'diff3' program.
+###   This will override the compile-time default, which is to use
+###   Subversion's internal diff3 implementation.
+# diff3-cmd = diff3_program (diff3, gdiff3, etc.)
+### Set diff3-has-program-arg to 'yes' if your 'diff3' program
+###   accepts the '--diff-program' option.
+# diff3-has-program-arg = [yes | no]
+### Set merge-tool-cmd to the command used to invoke your external
+### merging tool of choice. Subversion will pass 4 arguments to
+### the specified command: base theirs mine merged
+# merge-tool-cmd = merge_command
+
+### Section for configuring tunnel agents.
+[tunnels]
+### Configure svn protocol tunnel schemes here.  By default, only
+### the 'ssh' scheme is defined.  You can define other schemes to
+### be used with 'svn+scheme://hostname/path' URLs.  A scheme
+### definition is simply a command, optionally prefixed by an
+### environment variable name which can override the command if it
+### is defined.  The command (or environment variable) may contain
+### arguments, using standard shell quoting for arguments with
+### spaces.  The command will be invoked as:
+###   <command> <hostname> svnserve -t
+### (If the URL includes a username, then the hostname will be
+### passed to the tunnel agent as <user>@<hostname>.)  If the
+### built-in ssh scheme were not predefined, it could be defined
+### as:
+# ssh = $SVN_SSH ssh -q
+### If you wanted to define a new 'rsh' scheme, to be used with
+### 'svn+rsh:' URLs, you could do so as follows:
+# rsh = rsh
+### Or, if you wanted to specify a full path and arguments:
+# rsh = /path/to/rsh -l myusername
+### On Windows, if you are specifying a full path to a command,
+### use a forward slash (/) or a paired backslash (\\) as the
+### path separator.  A single backslash will be treated as an
+### escape for the following character.
+
+### Section for configuring miscelleneous Subversion options.
+[miscellany]
+### Set global-ignores to a set of whitespace-delimited globs
+### which Subversion will ignore in its 'status' output, and
+### while importing or adding files and directories.
+### '*' matches leading dots, e.g. '*.rej' matches '.foo.rej'.
+# global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo
+#   *.rej *~ #*# .#* .*.swp .DS_Store
+### Set log-encoding to the default encoding for log messages
+# log-encoding = latin1
+### Set use-commit-times to make checkout/update/switch/revert
+### put last-committed timestamps on every file touched.
+# use-commit-times = yes
+### Set no-unlock to prevent 'svn commit' from automatically
+### releasing locks on files.
+# no-unlock = yes
+### Set mime-types-file to a MIME type registry file, used to
+### provide hints to Subversion's MIME type auto-detection
+### algorithm.
+# mime-types-file = /path/to/mime.types
+### Set preserved-conflict-file-exts to a whitespace-delimited
+### list of patterns matching file extensions which should be
+### preserved in generated conflict file names.  By default,
+### conflict files use custom extensions.
+# preserved-conflict-file-exts = doc ppt xls od?
+### Set enable-auto-props to 'yes' to enable automatic properties
+### for 'svn add' and 'svn import', it defaults to 'no'.
+### Automatic properties are defined in the section 'auto-props'.
+enable-auto-props = yes
+### Set interactive-conflicts to 'no' to disable interactive
+### conflict resolution prompting.  It defaults to 'yes'.
+interactive-conflicts = no
+
+### Section for configuring automatic properties.
+[auto-props]
+### The format of the entries is:
+###   file-name-pattern = propname[=value][;propname[=value]...]
+### The file-name-pattern can contain wildcards (such as '*' and
+### '?').  All entries which match (case-insensitively) will be
+### applied to the file.  Note that auto-props functionality
+### must be enabled, which is typically done by setting the
+### 'enable-auto-props' option.
+*.c = svn:eol-style=native
+*.cpp = svn:eol-style=native
+*.cxx = svn:eol-style=native
+*.h = svn:eol-style=native
+*.s = svn:eol-style=native
+*.S = svn:eol-style=native
+*.dsp = svn:eol-style=CRLF
+*.dsw = svn:eol-style=CRLF
+*.sh = svn:eol-style=LF;svn:executable
+*.txt = svn:eol-style=native
+# *.png = svn:mime-type=image/png
+# *.jpg = svn:mime-type=image/jpeg
+Makefile = svn:eol-style=native
+README = svn:eol-style=native
--- a/Makefile	Sun Jan 02 13:27:14 2011 +0200
+++ b/Makefile	Sun Feb 20 21:11:47 2011 +0200
@@ -16,9 +16,9 @@
     .inputrc .minttyrc .Xdefaults .xinitrc .xserverrc \
     .bashrc .vimrc .ssh \
     .mailsign .tidy \
-    .hgrc .hgignore .bazaar
+    .hgrc .hgignore .bazaar .gitconfig .gitignore
 MANUALINSTALL_ITEMS = .mc
-IFNONEXIST_ITEMS = .wgetrc
+IFNONEXIST_ITEMS = .wgetrc .subversion
 
 .PHONY: install
 install: