diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:18:32 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:18:32 -0700 |
| commit | 635536488c3efcf8495333b6a94e3e33c36fc055 (patch) | |
| tree | dbe59109f95a57e008933d56ab28e72c7ae410ec /git-gui/.gitignore | |
| parent | Cleanup in sha1_file.c::cache_or_unpack_entry() (diff) | |
| parent | Merge branch 'sg/maint-intrebase-msghook' into maint (diff) | |
| download | tgif-635536488c3efcf8495333b6a94e3e33c36fc055.tar.xz | |
Merge branch 'maint'
* maint:
builtin-apply: fix typo leading to stack corruption
git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
builtin-merge.c: allocate correct amount of memory
Makefile: do not set NEEDS_LIBICONV for Solaris 8
rebase -i: remove leftover debugging
rebase -i: proper prepare-commit-msg hook argument when squashing
Diffstat (limited to 'git-gui/.gitignore')
0 files changed, 0 insertions, 0 deletions