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

03/10/08

updated readme
timcharper (author)
Mon Mar 10 10:57:44 -0700 2008
commit  d507fed343d376f886edbf37ac74c93ea85a4c51
tree    55a8654b3fc8b32795e53cf5341d2876417297dc
parent  9a5ef40b8d7fcb95565d2fa03e5d9dd4b841ea8e 
updated changelog
timcharper (author)
Mon Mar 10 09:43:17 -0700 2008
commit  9a5ef40b8d7fcb95565d2fa03e5d9dd4b841ea8e
tree    dab7647be2f79be71ac41785d91d863e395b02dd
parent  7145b3ba4666544cc960e3b3c2899636b676c8aa 
merge command was a bit over-eager.  No longer auto opens conflicted 
files.  (maybe make this a configurable options?)
timcharper (author)
Mon Mar 10 09:40:40 -0700 2008
commit  7145b3ba4666544cc960e3b3c2899636b676c8aa
tree    725a8fddf14590216149d5730c6e856473a5a2a8
parent  8149d9ac8d710714680519bcc52c5e91de3a1bea 
merge_parser was not pcking up on delete/modify merge conflicts.  fixed
timcharper (author)
Mon Mar 10 09:33:50 -0700 2008
commit  8149d9ac8d710714680519bcc52c5e91de3a1bea
tree    197ffde7c10f527be2862463d5cbd2d5c8c4fb36
parent  ed12f17c410c18ecf8abc68709e08c351db767ae 
"Working directory is clean" message disappeared.  Restored
timcharper (author)
Mon Mar 10 09:25:07 -0700 2008
commit  ed12f17c410c18ecf8abc68709e08c351db767ae
tree    62902cb534954d072bbff8ca36a411aafe9514cb
parent  d4f85b67c116c49ff271fdd5b4a892a50da1a9cf 
removed "fix me" notice (it was fixed).  status listing on merge commit 
was being filtered down to the selected file or directory, when it should 
show the status for the whole project (since it's doing a whole commit)
timcharper (author)
Mon Mar 10 09:22:19 -0700 2008
commit  d4f85b67c116c49ff271fdd5b4a892a50da1a9cf
tree    7c5276570df2a352abb9cd5a9e090f6f3e027aec
parent  176589801dc21f4e8918c55af31aedef79b8b94c 
Bugfix - merge command was breaking when trying to show links to 
conflicted files
timcharper (author)
Mon Mar 10 09:06:43 -0700 2008
commit  176589801dc21f4e8918c55af31aedef79b8b94c
tree    09823ed98b725d96948975655a1beaca6386edf6
parent  85527f2ef75471882dcd7a5933714e08bceae5e4

03/09/08

log limit increased to 100, since lazy-loading diffs is so much faster
timcharper (author)
Sun Mar 09 23:17:57 -0700 2008
commit  85527f2ef75471882dcd7a5933714e08bceae5e4
tree    d2b278bd225be63e34dff988d0f3a2f9b8bcb0da
parent  48a77bf81c4731655fc0bd655d6030ed9c24e3de 
updated todo list
timcharper (author)
Sun Mar 09 23:16:14 -0700 2008
commit  48a77bf81c4731655fc0bd655d6030ed9c24e3de
tree    cc2628241cc2ecc3aa5162c986782231b1b86955
parent  50e3f1539a500dc8b402528c619a0588c87c27eb 
updated readme
timcharper (author)
Sun Mar 09 22:52:32 -0700 2008
commit  50e3f1539a500dc8b402528c619a0588c87c27eb
tree    d907e41497b846ca436af650f0d208ab35503244
parent  ea9e704283f269673b82fd495dec003ddf4c598f 
switched shortcut key to Command-Option-G
timcharper (author)
Sun Mar 09 22:48:48 -0700 2008
commit  ea9e704283f269673b82fd495dec003ddf4c598f
tree    76dfb038b1e36ff4a04c233081ac05081c0639d8
parent  370e3d8fd005093dd636b86a8c33a5944abf280b 
updated changelog
timcharper (author)
Sun Mar 09 22:46:55 -0700 2008
commit  370e3d8fd005093dd636b86a8c33a5944abf280b
tree    ced206c22a669769c269e962ffc8befbe0f3d0b8
parent  9229c80dff86203a7734fd8cff4b0a471ff940fe 
capitalization fixes
timcharper (author)
Sun Mar 09 22:20:39 -0700 2008
commit  9229c80dff86203a7734fd8cff4b0a471ff940fe
tree    22265b538ae8db6db3b8dcb8e9b2533b540133fc
parent  fd0f4e60290c0c65f784d4cba8a423fa877114d3 
updated to add ellipsis, conforming to AHIG guidelines
timcharper (author)
Sun Mar 09 22:17:47 -0700 2008
commit  fd0f4e60290c0c65f784d4cba8a423fa877114d3
tree    2e8fbf69192294a731ca031f46f23186c3f94c42
parent  fb67daa36c7ecc71133dc84672837be811c703da

03/08/08

"Resolve Merge Conflict" command working again
timcharper (author)
Sat Mar 08 03:18:40 -0800 2008
commit  fb67daa36c7ecc71133dc84672837be811c703da
tree    e86c26ede660da59d1c324e68c918445104798b6
parent  916b4fcc1f868a463b0a55758783e770976a17e6 
diff controller spec fix
timcharper (author)
Sat Mar 08 03:08:27 -0800 2008
commit  916b4fcc1f868a463b0a55758783e770976a17e6
tree    9a3e687bb3e71ed5e340ae76b2eca2b1713298de
parent  73266049cddd751051a103960456418a54642e0e 
log spec had some controller related specs, that have since been 
rewritten.  moved over and commented in case there's still something 
useful there, or will be in the future
timcharper (author)
Sat Mar 08 03:07:15 -0800 2008
commit  73266049cddd751051a103960456418a54642e0e
tree    0b55e388770902b5a699a8afdf43f445c22c0319
parent  203b68b7c6499359480f5171440186f4899bca4a 
fixed the status spec.
timcharper (author)
Sat Mar 08 03:06:51 -0800 2008
commit  203b68b7c6499359480f5171440186f4899bca4a
tree    8a47ee960bfb7e0ffc62ce4638e42ef6bf09d48b
parent  33e0155f01830697994ff6b80262895f50b57bc5 
run all specs helper file
timcharper (author)
Sat Mar 08 03:05:16 -0800 2008
commit  33e0155f01830697994ff6b80262895f50b57bc5
tree    79f8db0175f515651e324f7e8c236c3dbbfc1330
parent  6db9e252f18b2b696ef7157344b9c67d54cc3e2f 
git_spec needed updating
timcharper (author)
Sat Mar 08 03:05:06 -0800 2008
commit  6db9e252f18b2b696ef7157344b9c67d54cc3e2f
tree    496a6d8177f04762e5b6154e4f1c31a5b051be6f
parent  d626259823d693b0ff721070fbbe7fdee04ddebe 
many spec fixes. run all helper, since "run files in folders" textmate 
command fails.
timcharper (author)
Sat Mar 08 03:02:24 -0800 2008
commit  d626259823d693b0ff721070fbbe7fdee04ddebe
tree    1f2327e8a849b7c091d29f4bc43994538eb2b9b3
parent  046a1c0b0382c4f9652df6e2d342e84d9978014c 
show stash command is working again
timcharper (author)
Sat Mar 08 02:52:01 -0800 2008
commit  046a1c0b0382c4f9652df6e2d342e84d9978014c
tree    04d6a525b935081e127bfa6e5657eddc89057577
parent  71696d70f16c7060314197c1711aa1046998303e 
compare revisions command works again
timcharper (author)
Sat Mar 08 02:49:08 -0800 2008
commit  71696d70f16c7060314197c1711aa1046998303e
tree    77e70527b5c6dfda44db3d25f947b0b87d6adf19
parent  5900c3d5c4aa1956672de5b22c688d158cdfd973 
compare branches working again
timcharper (author)
Sat Mar 08 02:40:24 -0800 2008
commit  5900c3d5c4aa1956672de5b22c688d158cdfd973
tree    2e9f9f0dd9620753cf1652f265d4856267677542
parent  58ca5b6cafe27dc114c733ffb326cf1fea8c187e 
bugfix - it doesn't really make sense to pass a single branch into the 
diff command, plus it was breaking stuff.
timcharper (author)
Sat Mar 08 02:30:43 -0800 2008
commit  58ca5b6cafe27dc114c733ffb326cf1fea8c187e
tree    6dec8434dfac70b6393aa4206689db98c4b6e9ae
parent  a6961b3c9724c34a155b2b9b4042c96ab33fdfda 
fix - the commit dialog diff output was recently broken.
timcharper (author)
Sat Mar 08 02:26:59 -0800 2008
commit  a6961b3c9724c34a155b2b9b4042c96ab33fdfda
tree    8d5122839247b074bbaae368fe64ab790c9266c6
parent  2e27e36359e26945613f42fa0531695270069e03 
lazy loading diffs for logs!  spruced up the format for collapsing logs a 
bit.
timcharper (author)
Sat Mar 08 02:22:39 -0800 2008
commit  2e27e36359e26945613f42fa0531695270069e03
tree    803091f549f497ce7d1ba8ee050ceb146f2ed724
parent  c7429a568eeae8bdb215fae002e335cb7a805d04 
fixed the order of the log parameters
timcharper (author)
Sat Mar 08 01:57:07 -0800 2008
commit  c7429a568eeae8bdb215fae002e335cb7a805d04
tree    032fe53dda07864c7ac0baa3a6a1e7f434c3c218
parent  b9171afa478f66b441c85af6d23bb523abcd394b 
refactored and removed the thread based layout wrapping, and replaced it 
with a "run the whole layout on flush" approach.  This fixes the deadlocks 
when the app throws an error.... which, were quite frustrating.  I guess 
it wasn't such a great idea after all :)
timcharper (author)
Sat Mar 08 01:27:40 -0800 2008
commit  b9171afa478f66b441c85af6d23bb523abcd394b
tree    d6f4d2996787b0732d33eebe2f6a996845f5aef5
parent  7a506ef76c9c55f6c0924472098ce72cc240c929 
tried to make this a little more friendly, to possibly help with 
dead-locks I've been experiencing.
timcharper (author)
Sat Mar 08 01:11:48 -0800 2008
commit  7a506ef76c9c55f6c0924472098ce72cc240c929
tree    a21459f866c7cde5ba2c1f94c0de7b75c8dae6a0
parent  30996919955bb3df4d67b39a79fb19c66ffe2fdb