repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'da/difftool-updates'
2012-08-15
Jay Soffi
a
n
gitweb:
URL-decode $my_url/$my_uri wh
e
n stripping P
A
TH_INFO
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2012-06-28
Jay Soffian
fas
t
-export: quot
e
paths wit
h
spa
c
e
s
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-10-12
Jay Soff
i
an
Teach
m
erge the '[-e|--ed
i
t]' op
t
io
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-10-06
J
ay
S
of
f
ian
cherry-pick: do not give irrelevant
a
dvic
e
when
cherr
y
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-10-06
Jay Soffian
r
evert
.
c: defer
w
riting CHERRY_PICK_HEAD
till it is
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-10-06
Jay Soffia
n
merge
-
one-file: fix "expr: non-numeric ar
g
ument"
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-10-04
Ja
y
Sof
f
ian
log --c
h
ildren
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-09-22
J
a
y Soffian
Teac
h
'
-
-cached' o
p
tion to ch
e
ck-att
r
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-09-20
Jay Soffian
gi
t
-mer
g
eto
o
l: check re
t
urn
v
alue from read
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-05-18
Jay Soff
i
an
Add log
.
abbrevCom
m
it conf
i
g variable
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-05-18
Jay
S
offian
"gi
t
log -h": typofix
m
i
ss
p
e
l
l
e
d 'suppress'
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Ja
y
Soffian
Te
a
ch commi
t
ab
o
ut CHE
R
RY_PICK_HEAD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Jay
S
offian
b
ash: teac
h
__git_ps1 a
b
out CHERRY_PI
C
K
_
HEAD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Jay
Soffi
a
n
Introduce CHERRY_PICK_HEAD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Jay Sof
f
ian
git-chec
k
out
.
txt: imp
r
ove
detached HEAD docum
e
ntation
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-15
Jay Soffian
mer
g
e: h
o
nor pre
p
are-commit-msg hook
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-09-16
Jay Soffian
gi
t
-
ls-fi
l
es
.
txt: clarif
y
-
x
/--exclud
e
o
p
tion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Jay Soffian
f
or-each-ref
:
fix
ob
j
e
ctname:sh
o
rt bug
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffia
n
MER
G
E_RR is in
.
git,
not
.
git/rr-
c
ache
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-20
J
a
y Soff
i
a
n
gitweb/Makefil
e
: f
i
x typo i
n
gitweb
.
m
i
n
.
c
s
s rule
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-16
Jay Soffian
am: use get
_
author_ident_f
r
om_c
o
mmit in
s
t
e
a
d
of
m
ailinfo
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-07
Jay Soffian
c
omm
i
t
.
txt: clarify how --author
a
rgument is used
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay
S
offian
t5516-fetch-push
.
sh: style
c
le
a
nup
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay S
o
f
fia
n
receive-pack: detect ali
a
sed up
d
ates which
can occur
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay So
f
f
i
an
rec
e
ive-pa
c
k: switc
h
gl
o
bal
va
r
iable 'c
o
mma
n
ds' to
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jay Soffian
Documentation/conf
i
g
.
txt
:
de
f
a
u
l
t gc
.
a
ggre
s
siveWindo
w
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-02-09
Jay Soffia
n
b
l
ame:
p
revent a s
e
gv w
h
e
n -L given sta
r
t
>
E
O
F
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Jay
S
offian
git
-
sv
n
: allo
w
sub
s
et of branches/tags to be specifi
e
d
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Jay Soff
i
a
n
git-svn: allow UUID to be
manually re
m
app
e
d
via rewriteU
U
ID
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
a
y Soffian
bui
l
tin-fetch: add -
-
dry-run option
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Ja
y
Soffian
builtin-fetch: add
--prun
e
option
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
a
y So
f
fian
te
a
ch warn_dan
g
ling
_
s
ym
r
ef to take a FILE
a
rgument
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay Sof
f
ian
r
e
mote: refa
c
t
or so
m
e logic
i
n
t
o
g
et
_
stale_heads()
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
send-email: fix nasty bug in ask() fu
n
ction
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
J
ay Soffian
send
-
email: en
s
ure quoted addresses are rfc2047
encoded
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
J
a
y Soffian
send-ema
i
l
: cor
r
ect
t
wo
te
s
ts which were goin
g
inte
r
a
c
tiv
e
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
J
ay
S
offian
s
end-email: ask
_
default shoul
d
ap
p
ly
to all emails
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay
S
o
f
fia
n
send-email: don't a
t
tempt to pro
m
pt if t
t
y is clos
e
d
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
send
-
email: add tests
f
or
refactor
e
d
p
rompting
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay So
f
f
i
a
n
send-email: r
e
factor and ensure prom
p
tin
g
doesn't
l
oop
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay Soffia
n
b
a
sh
co
m
pletion:
teach fetch, pul
l
, and pus
h
to complete
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay Soffian
bash
comple
t
ion
:
r
e
factor
--s
t
r
a
tegy co
m
pletion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay So
f
fian
bash c
o
mple
t
i
o
n:
f
i
x
completion
i
ssues w
i
t
h
f
etch,
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-03
Jay Soffian
send-email: add --confi
r
m
option an
d
c
onf
i
guration
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
bui
l
t
in-remote: new s
h
ow output st
y
le f
o
r push refspecs
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay
Soffi
a
n
builtin-rem
o
te: new show outp
u
t styl
e
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
builtin-rem
o
te:
a
dd set-head su
b
command
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay So
f
fian
builtin-rem
o
te: teach show to display remote
HEA
D
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Ja
y
Soffian
b
u
iltin-remo
t
e: fix two incon
s
iste
n
cies in the o
u
tput
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Ja
y
Soffian
builtin-
r
emote: m
a
ke get_remote_ref
_
states() always
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay So
f
fian
b
u
iltin-remote
:
rename vari
a
bles and el
i
m
i
nate redu
n
d
a
nt
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
builtin-re
m
ote: remo
v
e
u
nused co
d
e
in g
e
t_ref_states
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Sof
f
ian
bu
i
lti
n
-remote: refactor
dupli
c
ated c
l
ean
u
p
code
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay
Sof
f
ian
s
tr
i
ng-list: new fo
r
_eac
h
_string_list() func
t
ion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
J
a
y
Soffian
remo
t
e: make
m
atch_refs
(
) not
short-c
i
r
c
u
i
t
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
remote: make match_refs(
)
copy src ref
before assigning
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
remo
t
e:
let guess
_
r
e
mote_
h
ead() op
t
ionally ret
u
rn all
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay
S
offian
remo
t
e:
make
copy_ref() pe
r
form a deep copy
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay
S
o
ffian
t
5
5
40-http-push
.
sh: avoid non-portable grep -P
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
J
a
y Soffian
r
e
mote: simplify guess_remote_head()
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay
S
offi
a
n
move locate_head() to
r
e
m
o
t
e
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay
Soffian
mo
v
e
d
uplicated ref_newer() to remote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffian
move duplic
a
ted
g
et_local_heads
(
) to re
m
ote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-25
Jay
Soffian
Allow HTT
P
tes
t
s
t
o
r
u
n
o
n Darwin
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-24
Jay
S
offian
s
end-email: don
'
t creat
e
temporary com
p
os
e
file until
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-18
Jay S
o
ffian
d
isallow providing multipl
e
upstre
a
m branches to reb
a
s
e
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
J
a
y
Soff
i
an
send-email: -
-
suppress-
c
c im
p
rove
m
ents
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay
Soffian
send-email: hand
l
e
m
ultiple Cc addresses when reading
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Ja
y
Soffian
send-emai
l
: a
l
low send-
e
mail
to run outside
a
repo
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-14
J
ay Sof
f
ian
b
uiltin-branch: im
p
ro
v
e out
p
ut wh
e
n d
i
splaying remote
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-05
J
ay
S
offian
Makef
i
le: minor i
m
provem
e
nt
s
fo
r
M
ac OS X (Darwin)
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay Soffi
a
n
builtin-remote: make rm operati
o
n safer in mirrored
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay Soffian
b
uiltin-remote: make
rm() use p
r
operly named variab
l
e
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-28
J
a
y Soffian
g
it-am: m
i
nor
cleanups
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-14
Jay
S
offian
Git
.
p
m:
call E
r
r
or::Simple() proper
l
y
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-27
Jay Soff
i
an
send-email: fix In-R
e
p
l
y-T
o
regression
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
Jay Soffian
rev-par
s
e:
f
i
x
potentia
l
bus error with --parseopt
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-23
Jay S
o
ffian
pu
l
l: pass --strategy along to to rebase
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-22
Jay Soffi
a
n
send-email: fix In-Reply-
T
o regr
e
ssion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soffian
send-
e
mail: sque
l
ch wa
r
ning due
t
o c
o
mparing undefined
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soffian
Correct git-p
u
l
l
doc
u
menta
t
io
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay
S
o
ffian
doc: documen
t
at
i
o
n
updat
e
for th
e
b
r
anch track changes
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soff
i
an
branch:
optionally setup bran
c
h
.
*
.
merge from upstream
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-19
Jay
S
offian
builtin-checko
u
t
.
c: fix
possible usage
segfault
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
Jay Soffian
git-help--brow
s
e: improve
b
rowser
support under OS X
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
Jay Sof
f
ian
mailinfo: feed only on
e
line to handle_filter() 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 Soffian
git-gui
:
su
p
port
Git Gui
.
ap
p
und
e
r
OS X 10
.
5
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree