timcharper / git-tmbundle fork watch download tarball
public
Description: The Git TextMate Bundle
Homepage: http://tim.theenchanter.com/
Clone URL: git://github.com/timcharper/git-tmbundle.git
git-tmbundle / Commit History feed

09/22/08

fixed bug where merge commit message was being truncated to one line
timcharper (author)
Mon Sep 22 07:03:39 -0700 2008
commit  fa14e05fc8b300019a01be76edf85b6fc7833909
tree    49bc8fae1a5ebd0d6cdba60bee43f3da0837e96a
parent  8b39e657786f40123f9b28b92117e166f293dde8 
Changed Update Git Bundle input to "nothing"
timcharper (author)
Mon Sep 22 06:58:40 -0700 2008
commit  8b39e657786f40123f9b28b92117e166f293dde8
tree    bea89dbf1cfcc7f4d0dab15915e0ee439ccb9e06
parent  f120d0d3d934dfd043832e3db4755ebeea47bee5

09/18/08

bugfix - fixed conflict detection
timcharper (author)
Thu Sep 18 15:27:05 -0700 2008
commit  f120d0d3d934dfd043832e3db4755ebeea47bee5
tree    34773b0ce8b4862acd82f05c9358eb9dedf8c0ae
parent  589d10c5c6b7d243f2bd0327e9448233e5cc85db 
added spec for conflict detection
timcharper (author)
Thu Sep 18 15:20:52 -0700 2008
commit  589d10c5c6b7d243f2bd0327e9448233e5cc85db
tree    b6a07fcaaaec78f7a9ba796afadd28daa256b510
parent  5f379c78561f8b6e53a0588340792cec039bf197

09/02/08

regression fix - dialogs were blowing up when no branch was selected
timcharper (author)
Tue Sep 02 17:33:21 -0700 2008
commit  5f379c78561f8b6e53a0588340792cec039bf197
tree    93797d772053ebb753a0fb47b2e83fb7a4787094
parent  c86a8bc81b5e9a7662dc27b86b49a2151b453527

08/28/08

Merge commit 'a7adf3'
timcharper (author)
Thu Aug 28 22:04:20 -0700 2008
commit  c86a8bc81b5e9a7662dc27b86b49a2151b453527
tree    263a584dbec628520b97e6ec715abaad3dcc30b8
parent  7180d094e5bb3c7af6f5e265a870f559217f5ddc parent  a7adf347fa4d836456aa1a547289ceb0910cafd0 
added "for branch 'BRANCH NAME'" to most of the dialogs
Joe Tanner (author)
Thu Aug 28 11:24:42 -0700 2008
commit  a7adf347fa4d836456aa1a547289ceb0910cafd0
tree    599fa30ad3ba1c6752e4b8e017adc124a60f488f
parent  0756a6a91b7dfe0da96a4641e6626dabcdedc21c 
fixed diff_check_results check for stash pop operation (and all other 
items that use the diff_results partial)
timcharper (author)
Thu Aug 28 10:52:36 -0700 2008
commit  7180d094e5bb3c7af6f5e265a870f559217f5ddc
tree    e3fa1d8bc1472a086ec45f9c3f1a9d32d7dda4b7
parent  7314cf8455ae8d4566badc98de1b0bd4a08b89ea 
cleaned up "not on a branch" message.  added a simple, but helpful branch 
suggestion section
timcharper (author)
Thu Aug 28 10:44:34 -0700 2008
commit  7314cf8455ae8d4566badc98de1b0bd4a08b89ea
tree    db91cc3ba12e0c80e71683350bd8a2d999f0b3f2
parent  aeff1068a4097acc7f4ee2f8ca1747a8a65383c1 
fixed a regression that broke diffing of submodule directories
timcharper (author)
Thu Aug 28 10:20:11 -0700 2008
commit  aeff1068a4097acc7f4ee2f8ca1747a8a65383c1
tree    943651c8605e085f7577b2de14dcfb0daaab7a3a
parent  f3f63460b0b38b73a52694f6d7682cb100098f37

08/25/08

show-diff-check is configurable (and defaults to 'no')
timcharper (author)
Mon Aug 25 11:03:48 -0700 2008
commit  f3f63460b0b38b73a52694f6d7682cb100098f37
tree    3bd01367000afad4a118024d611d23c45d942763
parent  303a6ca35f163274bd36b0087b89d64a8d70d57a

08/22/08

Merge commit 'mblsha/master'
timcharper (author)
Fri Aug 22 23:44:31 -0700 2008
commit  303a6ca35f163274bd36b0087b89d64a8d70d57a
tree    578eea8ac9da372e93957e833d795dfa660f9efd
parent  1e85a9032525a3f34333766db05921baa699aa82 parent  a0bfa4c0b6834596a78c8c12682b12458f079675

08/21/08

- Local config settings for Log Limit and Log Context Lines were always 
saved to global and not saving to local.
drylight (author)
Thu Aug 21 19:49:42 -0700 2008
commit  1e85a9032525a3f34333766db05921baa699aa82
tree    58ed412805a475d4d61bc68f813af3fcd25690fe
parent  0756a6a91b7dfe0da96a4641e6626dabcdedc21c

08/11/08

Updated CHANGELOG
timcharper (author)
Mon Aug 11 05:11:00 -0700 2008
commit  0756a6a91b7dfe0da96a4641e6626dabcdedc21c
tree    2317ddda0ef8c08c4a7fd4ae32d69f895edadac8
parent  e956cdd43f3a4928a95fe57d9635f88f0cbf0caf 
Merge branch 'master' of git://github.com/melo/git-tmbundle
timcharper (author)
Mon Aug 11 05:09:40 -0700 2008
commit  e956cdd43f3a4928a95fe57d9635f88f0cbf0caf
tree    f2cb479a122cd68b9f2aa5500ab23e7a47a19d0e
parent  a81514db18388ab44f31b134876ef74d5f1fbd6f parent  fbe3088794332ade2b51fabb9d1c3be1f60668a8 
Fix git gui invocation
melo (author)
Mon Aug 11 04:41:36 -0700 2008
commit  fbe3088794332ade2b51fabb9d1c3be1f60668a8
tree    b3e3ba56555022f0975628f5687680d9f2c3a75d
parent  bd7c50a72450ff1a652199b4750669b9079f0cf4

07/28/08

use a space to tokenize instead of a \n
timcharper (author)
Mon Jul 28 10:38:58 -0700 2008
commit  a81514db18388ab44f31b134876ef74d5f1fbd6f
tree    47d3cde92106ec1613ea5e0f540857632a92255b
parent  bd7c50a72450ff1a652199b4750669b9079f0cf4

07/24/08

Bumped version 1.6.5
timcharper (author)
Thu Jul 24 13:10:11 -0700 2008
commit  bd7c50a72450ff1a652199b4750669b9079f0cf4
tree    bce1fa7b424beb7cf1cc21b4312d800f5e449a18
parent  c7ef297ca49bd80f004ba01fe17996aff13be9b8

07/23/08

updated spec to work with changes to a stash
timcharper (author)
Wed Jul 23 12:09:41 -0700 2008
commit  c7ef297ca49bd80f004ba01fe17996aff13be9b8
tree    7d04333477478e97577ca8d768f0139c6a169092
parent  1900ade2a306bd92b8d5540d25852f8097c7d2d1 
don't apply with --index by default, as this seems to cause more problems 
than it solves currently (in the future, would be nice to auto detect 
which strategy to use)
timcharper (author)
Wed Jul 23 12:03:05 -0700 2008
commit  1900ade2a306bd92b8d5540d25852f8097c7d2d1
tree    88a98eda74ba803db89b110da77ed006951b2efc
parent  623981c81a22a2052a797e50f16816dc78ae8e27 
Always pass path with gitnub as first argument (Thanks, Seth Barber)
timcharper (author)
Wed Jul 23 11:54:49 -0700 2008
commit  623981c81a22a2052a797e50f16816dc78ae8e27
tree    ee8434645e9c3eb2816303177de3ec6c1dbf6e06
parent  196102def7e4f5c442bc5cdb6ef0164c89877efe

07/15/08

Fix: Bundle was crashing when trying to get the branch name of a submodule 
that hadn't been checked out yet
timcharper (author)
Tue Jul 15 10:23:42 -0700 2008
commit  196102def7e4f5c442bc5cdb6ef0164c89877efe
tree    f611e4068085cc53441c3b43a648e77bd739aa0a
parent  a58c7355bf37482ec5400b1877778bb872fec4d7

06/15/08

Show 'git-diff --check' output when showing uncommitted changes.
mblsha (author)
Sun Jun 15 03:42:45 -0700 2008
commit  a0bfa4c0b6834596a78c8c12682b12458f079675
tree    4b7c0e9238e2a497e31e6ba6125275f5266e7ac9
parent  a58c7355bf37482ec5400b1877778bb872fec4d7

06/13/08

fixed ls_files to properly ignore files (I took it out earlier because it 
was causing git to throw an error message, but strangely, git is no longer 
complaining)
timcharper (author)
Fri Jun 13 14:29:24 -0700 2008
commit  a58c7355bf37482ec5400b1877778bb872fec4d7
tree    ef8ca81cf688b88d6a39157ef1ce0e57deb4a6b8
parent  0e663f9094997354197bc308909267d33a2d9f7f 
these specs are obsolete
timcharper (author)
Fri Jun 13 14:20:40 -0700 2008
commit  0e663f9094997354197bc308909267d33a2d9f7f
tree    ca5275af5813633afde1b72cec432c924ff8670b
parent  40f7c1f14b02c99482bd0aef137315756b669469 
additional spec to check that Git#auto_add_rm is properly being called
timcharper (author)
Fri Jun 13 14:20:29 -0700 2008
commit  40f7c1f14b02c99482bd0aef137315756b669469
tree    1285ceba412f242b43892b0ebdfbcbe6ef3ea5a2
parent  f6b835ecbfc1abb875ce5a39579f59854db0f140 
fixed auto_add_rm method - wasn't properly automatically deleting files, 
in the case of resolving a merge conflict
timcharper (author)
Fri Jun 13 14:19:58 -0700 2008
commit  f6b835ecbfc1abb875ce5a39579f59854db0f140
tree    37e2760289370f81a46c7a267dff38c92160e5a4
parent  14d72a15030f784324946129a0e7bbee2baecff5 
fixed bracket method of accessing branches
timcharper (author)
Fri Jun 13 14:19:00 -0700 2008
commit  14d72a15030f784324946129a0e7bbee2baecff5
tree    2c078d1ed38f70e7da8f7cde103c3e414b387692
parent  aa99a38405038aa79a5663af85fd8cfdb5a5b8c0 
force update button in "submodule"
timcharper (author)
Fri Jun 13 13:07:42 -0700 2008
commit  aa99a38405038aa79a5663af85fd8cfdb5a5b8c0
tree    ba39a8719cfa5315e13bcce0212c843a6ec6f235
parent  27932a01fb1d7f0ab4a15f42fe8b1fd4cdd63e6d

06/11/08

log all git commands to log/git.log when debug_mode is set
timcharper (author)
Wed Jun 11 11:20:53 -0700 2008
commit  27932a01fb1d7f0ab4a15f42fe8b1fd4cdd63e6d
tree    7758d5c7dcfd7f594f696c40fc60840b904a338b
parent  f38a24bd4e0b8c6b7a0c6e441442a1eba9141e5a