repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Teach merge the '[-e|--edit]' option
2011-10-12
Jay Soffian
Teach merge
t
he '[-e|--edi
t
]' option
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-09-20
J
ay Soffian
git-mergetool:
check return v
a
lue from r
e
a
d
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-05-18
Jay Soffian
Add
log
.
abbrevCommit config variab
l
e
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-05-18
Jay Soffian
"git l
o
g
-h": typofix misspel
l
ed
'
s
uppress'
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Jay
S
offia
n
T
eac
h
co
m
mit
abou
t
CH
E
RRY_
P
ICK_HEAD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Jay Soffian
bash: teac
h
__git_ps1 about CHERRY_PICK_H
E
AD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
J
a
y
Sof
f
ia
n
I
n
troduce CHE
R
RY_PICK_HE
A
D
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Jay So
f
f
ian
g
i
t
-
c
hecko
u
t
.
txt
:
improve det
a
ched HEAD documentation
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-15
Jay
Soff
i
an
m
erge: honor prepare-comm
i
t-msg ho
o
k
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-09-16
Jay Sof
f
ian
git-
l
s-files
.
txt:
clarify
-
x/--exclude optio
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Ja
y
S
offian
for-each-ref: fix objectname:short bug
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
J
a
y So
f
f
i
an
ME
R
GE_RR i
s
in
.
git, no
t
.
git
/
rr
-
cach
e
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-20
Jay Soffian
gitweb
/
M
akefile: fix
typo
in
g
i
t
web
.
min
.
css rule
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-16
Jay S
o
ff
i
an
am: us
e
get_author
_
ident
_
f
r
om_com
m
it inste
a
d o
f
mailin
f
o
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-07
Jay
S
offia
n
commit
.
txt: clari
f
y h
o
w --author a
r
gument i
s
used
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay Soffia
n
t5516-fetch-pus
h
.
sh: style cleanup
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
a
y
Soffia
n
r
e
c
eiv
e
-pack: detect a
l
i
ased updates whic
h
can oc
c
ur
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay
S
offian
receive-pack: switc
h
globa
l
var
i
able 'co
m
m
a
nds'
t
o
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Ja
y
Soffian
Docum
e
ntation/confi
g
.
tx
t
: default gc
.
aggressiv
e
Wi
n
dow
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-02-09
Jay
Soffian
bla
m
e: prevent a segv
w
hen -
L
give
n
star
t
> EOF
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Jay Soffia
n
git-svn: allo
w
subset of branches/ta
g
s t
o
be specified
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Ja
y
S
offian
g
i
t
-
s
vn: a
l
low UUID to
be man
u
ally re
m
apped vi
a
rewrit
e
UU
I
D
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay Soffian
builtin-fet
c
h
:
add -
-
dry-run option
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay Soffian
builtin-fetch: add --prune optio
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
a
y S
o
ffian
teach w
a
rn
_
da
n
gling_symref to t
a
ke a
FILE ar
g
ument
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay Soffian
re
m
ote: refactor some l
o
gic into
get_stale_heads()
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay S
o
ffian
sen
d
-email:
fix
nasty bug
in ask() func
t
ion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-email
:
ensure quote
d
addresses
a
re
rf
c
2047 en
c
o
ded
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
J
ay
S
offi
a
n
send-email: corre
c
t
two tests w
h
ich
w
ere going interactive
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-email: ask_default should
apply
to all emails
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-email:
d
o
n't
a
ttemp
t
to
p
rompt if tt
y
i
s
close
d
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
Ja
y
Soffia
n
send-email: add test
s
for refactored prompting
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay S
o
f
fian
send-email: ref
a
ctor and ensure prompt
i
ng doesn't
l
oop
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay Soffian
bash
c
ompleti
o
n
:
t
e
ac
h
fetch, pull, a
n
d push to
complet
e
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay Soffian
bash c
o
mp
l
et
i
on
:
r
e
factor --strat
e
gy comple
t
ion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay
Soffian
bash compl
e
t
ion:
fix completion
i
ssues with fetch,
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-03
Jay Soff
i
an
send-email:
add -
-
co
n
fir
m
option and
c
onfiguration
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
J
a
y
So
f
f
i
an
b
uiltin-re
m
ote
:
new show output
s
tyle for push r
e
f
s
pec
s
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
an
builtin-re
m
ote: new show
o
utput
s
tyle
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
builtin-remo
t
e
: add set-head subcomman
d
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
J
ay Sof
f
ian
bui
l
tin-rem
o
te: teach show to
di
s
play remote HE
A
D
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Sof
f
ia
n
builtin-remote:
fix tw
o
inconsistencies in t
h
e output
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
an
b
u
iltin-remote: make
get_remote_ref_s
t
a
t
es() always
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
bui
l
tin
-
remote: rename variables and el
i
min
a
t
e redundant
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
an
builtin-re
m
ote: remove un
u
sed co
d
e
in get_ref_states
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffia
n
builtin-remo
t
e: refactor dup
l
icated c
l
ea
n
u
p
code
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffia
n
string-list
:
new for_each_stri
n
g_li
s
t() fu
n
ction
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
remo
t
e: make matc
h
_refs() not sho
r
t-circuit
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
a
n
rem
o
te:
m
ake match_refs(
)
cop
y
s
r
c ref
b
efore assigning
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Ja
y
So
f
fian
remote: le
t
guess_remote_head() opt
i
onally return all
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
remote: make copy
_
ref() perfo
r
m a deep c
o
py
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Ja
y
Soffian
t5540-http-pu
s
h
.
sh
:
avoid non-portabl
e
grep -P
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffi
a
n
remote: simpl
i
fy guess
_
r
e
mote_head
(
)
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffian
move locate_head()
t
o remote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
J
a
y Soffi
a
n
move duplicated r
e
f_newer() t
o
remote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soff
i
an
move dupl
i
cated
ge
t
_loca
l
_heads() to remote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-25
J
ay S
o
f
f
ian
Al
l
ow HT
T
P tests
to run on
D
arwin
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-24
Jay Soffian
send-em
a
il: don't cre
a
te temporary compose file un
t
i
l
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-18
Jay Soffi
a
n
di
s
allo
w
providing multiple upstream bra
n
ch
e
s to reba
s
e
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
J
a
y
Soff
i
a
n
send-email: --s
u
ppress
-
cc impr
o
vements
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
J
a
y
Soffian
send-
e
ma
i
l: handle multiple Cc addr
e
sses w
h
en readi
n
g
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay Sof
f
ian
send-email:
a
llow se
n
d-
e
mail to run o
u
tsid
e
a repo
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-14
Jay Sof
f
i
an
b
uiltin
-
branch: imp
r
o
ve output when displaying remote
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-05
Jay S
o
ffian
M
akefile: m
i
n
or improvement
s
for Mac OS
X
(Darwin)
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay Soffian
b
uiltin-remote:
mak
e
r
m
o
pera
t
ion safe
r
i
n
m
irro
r
ed
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay Soffian
bui
l
tin-remote: make
rm() use
p
roperly named v
a
riable
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-28
Jay
S
o
ffi
a
n
git-
a
m
:
m
i
nor cleanups
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-14
Jay Soffian
Git
.
p
m: call Error::Simple() proper
l
y
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-27
Jay Soffian
send-e
m
ail: fix In-Re
p
ly-To
r
egression
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
Jay Soff
i
an
r
ev-parse: fix p
o
tential bus
e
rro
r
w
i
th --parseopt
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-23
Ja
y
Soffian
pull
:
pass --str
a
tegy alon
g
t
o
to rebase
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-22
J
a
y
Soffi
a
n
send-email: fix In-Reply-T
o
regression
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
J
a
y S
o
ffia
n
s
end-
e
mail:
squelch warning
d
ue
to comparin
g
undefined
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Sof
f
i
a
n
Correct git-pull documentation
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soffian
doc:
d
ocu
m
e
n
tation up
d
ate for the branch t
r
ack changes
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
J
a
y
Soffian
branch: option
a
lly setu
p
branc
h
.
*
.
m
e
rge f
r
om upstream
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-19
Jay Soffi
a
n
b
u
iltin-che
c
kout
.
c: fix p
o
ssible usage
s
egfa
u
l
t
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
Jay Soffian
g
i
t-help--
b
r
o
wse: im
p
rove
browser supp
o
rt under OS X
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
Ja
y
S
off
i
an
m
aili
n
fo: feed on
l
y
one
l
ine to
hand
l
e_f
i
lter()
for
.
.
.
The issue was noticed and fixed by
Jay Soffian
. JC added a test
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-12
Jay S
o
f
f
ian
git-gu
i
: support
Gi
t
Gu
i
.
a
p
p u
n
der OS X 10
.
5
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree