| commit | 0a453a237e4e865d60661be3d895525534efe631 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Thu, 9 Aug 2007 00:44:31 +0000 (9 01:44 +0100) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Thu, 9 Aug 2007 00:45:22 +0000 (9 01:45 +0100) | ||
| tree | f27cd6eaeda5d2412ecf8f9c8694ad27659aacc9 | treesnapshot (tar.gz zip) |
| parent | 8ca1f6af8c343172ca885076b8e581137ac05faf | commitdiff |
| parent | 74276ec6f2d2123714066cee24b26a629930e7a8 | commitdiff |
Merge commit 'junio/master'
Conflicts:
Makefile
builtin-config.c
cache.h
config.c
git-gui/git-gui.sh
lockfile.c
path.c
setup.c
t/t9200-git-cvsexportcommit.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Conflicts:
Makefile
builtin-config.c
cache.h
config.c
git-gui/git-gui.sh
lockfile.c
path.c
setup.c
t/t9200-git-cvsexportcommit.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
25 files changed: