diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-03-12 20:26:59 +0300 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-03-12 20:26:59 +0300 |
| commit | 2ec0cb7959b0bf965d54f95453f5b4b34e8d3100 (patch) | |
| tree | 56e3e7313ce204a3cef274c81e8f125f9b03669e /.gitignore | |
| parent | 0c3b4aac8ecdd039bac663a7d1b6bd373b7e250d (diff) | |
| parent | 756d846fea4ac4b3bf0a0aea9fbf721138cf34cc (diff) | |
Merge branch 'maint'gitgui-0.6.5
* maint:
git-gui: Allow 'git gui version' outside of a repository
git-gui: Revert "git-gui: Display all authors of git-gui."
git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
git-gui: Allow committing empty merges
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 805ca2e1c7..c714d382e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -CREDITS-FILE GIT-VERSION-FILE git-citool git-gui |