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
git notes merge: Handle real, non-conflicting notes merges
2010-07-14
J
a
y
Soffian
ME
R
GE_RR i
s
in
.
g
i
t, not
.
git/rr-cache
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-20
Jay Sof
f
ian
gitweb/Makefile: f
i
x
typo in
gi
t
web
.
m
i
n
.
c
s
s r
u
le
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-16
Jay Soffian
am: use get_author_ident_from_commit inst
e
ad
of maili
n
fo
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-07
J
a
y
S
o
ffian
com
m
it
.
txt: clarify how --auth
o
r
a
r
g
um
e
n
t is used
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay Soffi
a
n
t5516-fetch-p
u
sh
.
sh: style cleanup
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
ay Sof
f
ian
receive-pack: dete
c
t al
i
ased upda
t
es wh
i
ch can occur
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay So
f
fi
a
n
r
e
ceive-pack: switch global v
a
riable '
c
omma
n
d
s'
t
o
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
J
ay Soffian
Docum
e
n
tation/c
o
nfig
.
txt
:
de
f
ault gc
.
ag
g
re
s
siveWindow
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-02-09
Jay
Soffian
blame
:
p
r
event a se
g
v whe
n
-L giv
e
n
start > EOF
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Jay Soffian
gi
t
-svn: allow su
b
set o
f
bra
n
che
s
/t
a
gs to
b
e specified
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Jay
Soffian
gi
t
-svn: allow UUID to b
e
manually remapped via rewriteUUI
D
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay S
o
ffian
builtin
-
f
e
tc
h
: add --d
r
y-r
u
n
o
ption
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
a
y So
f
fian
buil
t
in-fe
t
ch: add --prune option
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay Soffian
tea
c
h war
n
_da
n
glin
g
_symref to take a
F
ILE argum
e
nt
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay S
o
ffian
r
e
mote: refacto
r
some logic into get
_
sta
l
e_heads()
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
send-email: fi
x
nasty bug in ask(
)
function
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
J
ay Soffian
s
end-email:
e
n
sure q
u
o
t
ed addresses are r
f
c2047 encoded
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay
S
offian
s
end-email: correct
two tests whic
h
were going
int
e
rac
t
ive
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-email: ask_de
f
ault sh
o
uld apply to all emails
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
J
ay Soff
i
a
n
send-
e
mail: don't
a
ttemp
t
to p
r
ompt
if
t
ty is
c
losed
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
J
ay S
o
f
f
ian
send-emai
l
: add tes
t
s for
refactored p
r
omptin
g
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffia
n
s
e
n
d-e
m
ail: refactor and ensure prompting doesn't loo
p
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay Soffian
b
ash compl
e
tion: teac
h
f
etch, pull
,
a
nd push to compl
e
te
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Ja
y
Soff
i
a
n
bash
completion: re
f
actor -
-
strategy
c
omplet
i
on
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay
Soffian
bash completion: fix completion iss
u
es wit
h
f
e
tch,
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-03
Jay
S
off
i
a
n
send-email: add --c
o
nfirm
o
ption
a
nd configurat
i
o
n
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
an
b
u
iltin-remote: new show out
p
ut style for
p
u
s
h refspecs
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffi
a
n
buil
t
in-remote:
n
e
w show outp
u
t style
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffia
n
builtin-
r
emot
e
:
a
dd set-head subcommand
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
builtin-
r
e
m
ot
e
: t
e
ach s
h
o
w
t
o
display remote HEAD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay
S
offian
b
uiltin
-
remote: fix two in
c
onsistencies in the
out
p
ut
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffi
a
n
builtin
-
r
emo
t
e: make get_r
e
m
o
te_ref_states() al
w
ay
s
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay
So
f
fian
builtin-r
e
mote: rename va
r
ia
b
les
a
nd eliminat
e
redun
d
a
nt
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
an
bui
l
tin-remote
:
remove
u
nused code in g
e
t_r
e
f
_states
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
builtin
-
r
e
mote:
r
e
factor duplicat
e
d cleanup code
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffia
n
stri
n
g-list:
new for_each_string_lis
t
() function
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
J
ay
Soffia
n
remote: make ma
t
ch_refs() no
t
short-circuit
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
r
e
mo
t
e: make match_refs() co
p
y
src
r
ef bef
o
r
e assig
n
ing
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soff
i
an
remote
:
let gue
s
s
_re
m
ot
e
_head() opti
o
n
all
y
return all
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
J
a
y Soffian
remote: m
a
ke c
o
py_ref() perform a de
e
p
co
p
y
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
t5540-http-
p
ush
.
sh: av
o
id non-po
r
ta
b
le grep -P
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffian
remo
t
e
:
s
implify g
u
ess_remote_head()
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffian
move loc
a
te_
h
ead() to rem
o
te
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffia
n
m
ove
dup
l
icated
r
ef_newer() to remote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffian
move d
u
plicated ge
t
_l
o
cal_he
a
ds() t
o
remo
t
e
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-25
Jay Soffian
All
o
w HTTP tests to
r
un on Darwin
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-24
Jay S
o
f
fian
sen
d
-email: don't creat
e
temporary compose file un
t
il
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-18
Jay Soffi
a
n
disallow pr
o
viding mult
i
ple upstrea
m
branche
s
to rebase
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Ja
y
Soffian
send-email:
-
-
su
p
press-cc
i
mproveme
n
ts
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay
S
offian
send
-
email: handle
m
ultip
l
e Cc addresses when reading
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay Soffian
send-email
:
allow se
n
d-email to
run outside a repo
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-14
Jay So
f
fian
builtin-b
r
anch: improv
e
output when disp
l
aying r
e
mote
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-05
Ja
y
Sof
f
ian
M
akefile:
m
inor im
p
r
ovements for Mac O
S
X
(Da
r
win)
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay Soff
i
an
builtin-rem
o
te: make
r
m
ope
r
atio
n
saf
e
r in m
i
rrored
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay S
o
ffi
a
n
bu
i
ltin-re
m
ote: m
a
ke r
m
() use properly named variable
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-28
Jay Soffian
git-am: minor cleanups
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-14
Ja
y
Soffi
a
n
Git
.
pm: call Error::
S
impl
e
() pr
o
p
e
rly
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-27
Jay Soff
i
a
n
s
end-emai
l
:
fix In-Reply-
T
o regr
e
ssion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
Jay S
o
ffian
r
e
v
-parse: fix potential bus error with --parseopt
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-23
J
ay Soffian
pull: pass --strategy
a
long to t
o
r
e
base
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-22
Ja
y
Soffian
sen
d
-email: fix In
-
Reply-To regression
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Ja
y
So
f
fia
n
send-email:
squ
e
lch war
n
ing due to compa
r
ing undefined
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soff
i
a
n
C
o
rrec
t
git-pull documentation
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
J
ay Soffian
doc: documentatio
n
update for the branch track changes
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soffian
b
ranch: optionall
y
setup bran
c
h
.
*
.
merge from upstream
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-19
Jay Soffia
n
bui
l
tin-chec
k
out
.
c: fix
possibl
e
usa
g
e segfaul
t
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
Jay S
o
f
f
ian
g
it-help--browse: im
p
rove brow
s
er
supp
o
rt und
e
r OS
X
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
Jay Soffian
mailinfo: feed only one line to handle_fil
t
er() f
o
r
.
.
.
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
ffi
a
n
git-gui
:
support Git Gui
.
app under OS X 1
0
.
5
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree