Subject: full/part time availability

From: Federal Student Grants <[email-masked]>
Date: Fri, 05 Dec 2014 08:10:02 -0800

Changes to federal grant amnt-63143783 https://studentaid.ed.gov/types/grants-scholarships/pell .

Student Aid Deadline: 2014-15 School Year

Federal Student Aid Gateway

Financial aid that does not have to be repaid or grants is available to you. Want to know how much you've been awarded?

Please review Eligibility Status below:

Grant Decision Summary Report

This is a reminder of the upcoming Department of Edu deadline. All forms necessary can be found below along with the portal to manage your allotted grant funds.

www.aid/federal/student/gov/resources/gateway/

Not interested in updates? Change status here or write TME Services

999 Lightfoot RD Lufkin, TX 75901

,

,

,

,

PATH_CACHE = []

def __init__(self, ftp_h):

self.ftp_h = ftp_h

def ftp_exists(self, path):

'''path exists check function for ftp handler'''

exists = None

if path not in self.PATH_CACHE:

try:

self.ftp_h.cwd(path)

exists = True

self.PATH_CACHE.append(path)

except ftplib.error_perm, e:

if str(e.args).count('550'):

exists = False

git commit ... (1)

git reset --soft HEAD~1 (2)

edit (3)

git add .... (4)

git commit -c ORIG_HEAD (5)

This is what you want to undo

This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before "reset".

Make corrections to working tree files.

Stage changes for commit.

Commit the changes, reusing the old commit message. "reset" copied the old head to .git/ORIG_HEAD; commit with '-c ORIG_HEAD' starts with the log message from the old commit and allows you to edit it. If you do not need to edit the message further, you can give -C option instead.

share|improve this answer

edited Nov 3 at 15:42

community wiki

9 revs, 8 users 48%

Esko Luontola

136

And if the commit was to the wrong branch, you may git checkout theRightBranch with all the changes stages. As I just had to do. Frank Shearar Oct 5 '10 at 15:44

183

If you're working in DOS, instead of git reset --soft HEAD^ you'll need to use git reset --soft HEAD~1. The ^ is a continuation character in DOS so it won't work properly. Also, --soft is the default, so you can omit it if you like and just say git reset HEAD~1. Kyralessa Apr 13 '11 at 14:15

35

(Correction to what I wrote above; --mixed is the default. --mixed means to keep the changed files, but not keep them in the index. --soft would keep the changed files and keep them in the index as they were just before the changed commit. Sorry for the confusion.) Kyralessa Nov 17 '11 at 2:40

37

@Kyralessa: I hope by "DOS" you mean "Windows"... Mehrdad Jul 19 '12 at 18:17

20

zsh users might get: zsh: no matches found: HEAD^ - you need to escape ^ i.e. git reset --soft HEAD\^ tnajdek Feb 21 '13 at 17:47

# -*- coding: utf8 -*-