repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: demonstrate an incorrect conflict with submodule
2010-06-07
J
a
y
Soffian
c
ommit
.
txt: clar
i
fy how --
a
uthor argum
e
n
t
is used
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay Soff
i
an
t
5
5
16-fetch-
p
u
sh
.
sh: style c
l
e
anup
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay Soffian
receiv
e
-
pack: detect aliase
d
updates
w
hich
can occ
u
r
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay Sof
f
ian
receive-pack
:
switch global
v
ariab
l
e
'com
m
ands' to
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Ja
y
So
f
fian
Document
a
t
ion/
c
onfig
.
t
x
t: default
g
c
.
aggressiv
e
Window
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-02-09
J
a
y Soffi
a
n
b
l
a
me
:
p
revent a segv wh
e
n -
L
given
s
tart
> EOF
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
J
ay Soffian
g
i
t
-svn: allow sub
s
et of branches
/
tags
to be specified
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
J
a
y
Soffian
g
i
t-
s
vn: a
l
low UUID to
be manual
l
y
r
emapped via rew
r
it
e
UUID
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay
S
offian
b
u
iltin
-
f
e
tch
:
add
-
-dry-ru
n
option
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Ja
y
So
f
fian
builtin-fetch: add --prune option
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay
Soffia
n
tea
c
h warn_dan
g
ling
_
symref to take a FILE argu
m
ent
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay Soffi
a
n
rem
o
te
:
refactor
some logic
int
o
g
e
t_stale
_
heads()
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
send
-
e
m
a
il: fix n
a
s
t
y bug in
a
sk() functio
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay So
f
f
i
an
send-email: en
s
u
r
e
quoted addre
s
ses are rfc2
0
4
7
e
ncoded
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay
S
o
ffian
s
end-email:
c
orrect two te
s
ts which wer
e
goi
n
g interact
i
ve
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay
Soffian
send-em
a
i
l
: ask_default should app
l
y
t
o all
email
s
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay So
f
f
ian
send-ema
i
l: don't attempt to prompt if tty i
s
closed
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay So
f
fian
sen
d
-email: add tests for r
e
fact
o
red prompting
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
s
end-emai
l
: refac
t
or and ensure prom
p
ting doesn't lo
o
p
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
J
ay Sof
f
ian
bash
c
ompletion: teach fetch
,
p
u
ll, and push to complete
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Ja
y
S
o
ffian
bash compl
e
t
ion: refactor --strategy com
p
letion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay Soffi
a
n
bash
comple
t
io
n
:
fix completion issues with fetch,
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-03
Jay Sof
f
ia
n
send-e
m
ail: add
-
-confirm optio
n
and
c
onfiguration
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
built
i
n-remo
t
e:
n
ew show output style for push
refspecs
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Sof
f
ia
n
builtin-remote: new show
o
u
t
p
ut style
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
J
ay Soffian
bui
l
t
i
n-remote: add se
t
-he
a
d s
u
b
command
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay
S
offian
builti
n
-remote: teach show to display remote HEAD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Sof
f
ian
b
uiltin-remo
t
e: fix two incon
s
isten
c
ies in the output
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Ja
y
Soffian
built
i
n-r
e
m
o
t
e:
m
ake ge
t
_remo
t
e_ref_states() always
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Ja
y
S
o
ffian
builtin-remote:
r
ename v
a
riables
and
eliminat
e
redundant
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
a
n
builtin-remote: remove unused c
o
de in get_ref_states
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
an
built
i
n-remo
t
e
:
refactor dupli
c
a
ted clea
n
up code
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
J
a
y So
f
fian
string-
l
i
s
t: new
fo
r
_each_strin
g
_list() functi
o
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Ja
y
S
offian
remote: make match_refs() not short-circuit
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay
Soffian
remote: make match_re
f
s
() c
o
py src r
e
f before assignin
g
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Sof
f
ian
remote: let
g
u
ess_remote_head() opt
i
ona
l
ly return all
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
re
m
ote: make copy_re
f
()
p
erform a deep c
o
py
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
an
t5540-
h
ttp-push
.
sh: av
o
id n
o
n
-
portable
g
rep -P
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffian
remote: s
i
mpl
i
fy gues
s
_remote
_
head()
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffian
mov
e
locate_head(
)
to remote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffian
move du
p
l
i
cated ref_newer() t
o
r
e
mote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Ja
y
Soffian
move d
u
plica
t
e
d
get_local_
h
e
a
ds() to remote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-25
Jay Soffian
A
l
low HTTP
tests to run on Darw
i
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-24
Jay
S
off
i
an
s
e
n
d
-email:
don't create temp
o
r
a
ry com
p
ose file
u
ntil
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-18
Jay Soffia
n
disall
o
w
prov
i
d
i
ng multip
l
e ups
t
rea
m
bra
n
ches to re
b
ase
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay Soffi
a
n
sen
d
-em
a
il: --suppress
-
cc
i
m
prove
m
ents
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay Soffian
send-email:
h
a
ndle mult
i
pl
e
Cc addresses when reading
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay Soffian
send-e
m
a
il:
all
o
w sen
d
-
email t
o
ru
n
o
ut
s
ide
a repo
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-14
Jay
S
offian
b
u
i
ltin-branch: improve o
u
tpu
t
when displ
a
ying rem
o
te
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-05
Jay
S
offi
a
n
M
a
k
efil
e
: minor improvements fo
r
Mac OS X (Darwin)
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay
Soffi
a
n
buil
t
in-r
e
mote: make rm op
e
ra
t
ion safer in mirrore
d
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay Soffi
a
n
builtin-remote: make rm() u
s
e p
r
operly named variable
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-28
Jay
Soffian
git-
a
m: minor cleanups
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-14
Jay S
o
ffian
Git
.
p
m
:
c
a
l
l Err
o
r::Simple()
prop
e
rly
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-27
J
ay Sof
f
ia
n
send-ema
i
l: fix I
n
-Reply-T
o
reg
r
essio
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
Jay Soffia
n
re
v
-parse: fix
p
ot
e
nt
i
al bus e
r
ror w
i
th --parseo
p
t
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-23
Jay Soff
i
an
p
u
ll: pa
s
s
-
-strat
e
gy along
t
o to re
b
ase
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-22
J
ay
S
of
f
ian
send-email: fix In-R
e
ply-To
r
egres
s
ion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soffian
sen
d
-email: squelch warning due to compari
n
g undefined
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
J
ay Soffian
Correc
t
git-
p
ull documentation
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soffian
doc: docu
m
entation update for t
h
e branch track c
h
a
nges
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay
Soffi
a
n
bran
c
h: opt
i
onally se
t
up b
r
a
nc
h
.
*
.
merge from upstr
e
am
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-19
Jay So
f
f
ian
builtin-c
h
ec
k
out
.
c: fix possible usag
e
segfault
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
Jay Soffian
g
i
t-hel
p
-
-br
o
wse: improve bro
w
ser
s
u
p
p
ort unde
r
OS X
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
Jay
S
o
ffian
mailinfo: feed only one
l
ine
to h
a
ndle_filt
e
r(
)
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
J
a
y So
f
f
ian
git-gui: support Git
G
ui
.
app under OS X 10
.
5
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree