repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Show a failure of rebase -p if the merge had a conflict
2008-12-11
Jeff King
rebas
e
: imp
r
o
v
e erro
r
m
essage
s
about
dir
t
y state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Jeff
K
i
ng
diff: r
e
spect textconv i
n
rewrite diffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-10
Jeff Kin
g
diff: fix ha
n
dling o
f
binar
y
rewri
t
e
diffs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff: a
l
low tu
r
ning o
n
textconv exp
l
icitly for pl
u
mbing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
reorder ALLOW_TEXTCONV o
p
tion settin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
tag: delete TAG_EDIT
M
SG only on successful tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
a
dd stage
to gitignore
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff K
i
ng
stat
u
s: show
"
-v" d
i
ff even for i
n
itial c
o
mmit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Je
f
f
K
ing
commit
:
Fix stripping of patch in ver
b
ose mode
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
J
eff King
wt-stat
u
s: refactor init
i
al co
m
m
i
t printing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
define
empty tre
e
s
ha
1
a
s
a macro
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff Kin
g
receive-pack: de
t
ect push
to cur
r
ent b
r
anch of
n
on
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff King
t551
6
:
r
e
f
actor oddball tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-09
Jeff Kin
g
t5400: expect success for denying
deletion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
send-pack: do not s
e
n
d out single
-
level ref
s
such as
.
.
.
commit
|
commitdiff
|
tree
2008-11-02
J
e
ff King
fix
ov
e
r
lap
p
ing memcpy in normalize_a
b
solute
_
path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
pack-
o
bjects: avoid rea
d
ing unin
i
ta
l
ized
d
at
a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-11-02
J
ef
f
Ki
n
g
correct cache
_
en
t
ry allocati
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
en
a
ble
te
x
tc
o
nv for dif
f
i
n
ver
b
ose status/commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
ff King
a
d
d
u
s
er
d
iff textconv
t
ests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
f
f
King
wt-status: lo
a
d di
f
f ui config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff K
i
ng
only t
e
xtc
o
nv regula
r
files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Je
f
f
King
us
e
rdiff: requ
i
re e
x
plicitly
a
l
l
ow
i
ng textconv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
J
e
ff
K
ing
re
f
acto
r
userdiff t
e
xt
c
onv code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
document
t
h
e
diff
d
rive
r
textco
n
v
f
e
ature
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-26
Jeff King
diff: add missing static declaration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
J
eff King
submodule:
fix some
n
on-port
a
bl
e
grep i
n
vocat
i
ons
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-23
Jeff King
rm
:
loosen sa
f
e
t
y
val
v
e
f
o
r empty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-21
J
eff
King
docum
e
nt "intent
t
o
a
d
d
"
o
p
tio
n
to git-add
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
J
eff K
i
ng
diff: add fil
t
er fo
r
c
o
nverting binary t
o
text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
Jeff King
d
i
ff: introduce diff
.
<driver>
.
binary
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
Jeff
King
diff: unify external
diff and funcname pars
i
ng code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-18
Jeff King
t4012: us
e
test
_
cmp instea
d
of cmp
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-17
Jeff
K
ing
ref
a
c
t
or handling of "oth
e
r" files in ls-files and
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-17
Jef
f
King
tests: shell negati
o
n po
r
t
abil
i
ty fix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-13
Jeff
King
tests:
shell n
e
gation portabil
i
ty
f
ix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-12
Jeff King
git apply
--d
i
rectory broken for
new
fi
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-06
Jeff King
tutor
i
al: upda
t
e
o
utput
o
f git
c
om
m
it
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-03
Jeff King
Makefile: do not set NEEDS_LIBICONV for
S
olaris 8
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-10-03
Jeff King
r
e
fo
r
mat
informational commit mes
s
age
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-09-30
Jeff
K
ing
te
s
ts: g
r
ep portabi
l
ity fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-09-11
Jeff King
U
se c
o
mpatibi
l
ity regex li
b
rary also
on FreeBSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-09-03
Jeff K
i
ng
c
h
e
ckout:
f
i
x
message
w
hen leaving detach
e
d HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pretty=format:
r
esp
e
ct da
t
e format
optio
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
forma
t
-patch
:
use
d
efault diff for
m
at eve
n
wit
h
p
a
tch
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-08-25
Jeff Ki
n
g
Fix "git log -i --g
r
ep"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-08-20
Jeff Kin
g
decorate: al
l
ow const objects to be de
c
o
rated
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-08-20
Je
f
f
K
ing
mai
l
info:
avoid viola
t
ing s
t
rbuf a
s
sertion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-08-02
Jeff King
init: handle e
m
pty "tem
p
late" paramete
r
commit
|
commitdiff
|
tree
2008-07-31
J
e
f
f Ki
n
g
Compa
c
t c
o
mmit template message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-07-28
Je
f
f King
in
i
t:
ha
n
dle empty "t
e
mplate" parameter
commit
|
commitdiff
|
tree
2008-07-26
Jeff King
spawn pager vi
a
run
_
c
o
mm
a
nd interface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-07-26
Jeff King
r
u
n-co
m
mand: ad
d
pre-exe
c
callback
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-07-08
Jeff King
avoid null SHA1 in oldest
r
e
f
log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-07-08
Je
f
f King
make deleting a
m
issing ref
more quiet
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-07-06
Jef
f
King
Allow per-command
p
ager c
o
nfig
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
fetc
h
: give a hint to the use
r
wh
e
n local refs fail
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
doc/rev-
p
ars
e
:
clarify reflog vs --
u
n
t
il
for spec
i
fying
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-27
Jeff K
i
ng
fetch: r
e
port local storage erro
r
s in st
a
tu
s
t
a
b
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-26
Jeff King
improve for
-
eac
h
-
r
ef test
s
cript
commit
|
commitdiff
|
tree
2008-06-25
Jef
f
K
ing
clon
e
:
create intermediate directories
o
f destination
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
J
e
f
f
K
ing
for-
e
ach-ref: i
m
plement missing
t
ag values
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-25
Jeff Kin
g
clone: create intermediate di
r
e
ctories of destination
.
.
.
commit
|
commitdiff
|
tree
2008-06-18
Jeff K
i
ng
clea
n
up error
conventions o
f
re
m
ote
.
c:match_explic
i
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Jeff Kin
g
enab
l
e whi
t
espace ch
e
cking
of test
scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Jeff King
avoid traili
n
g whitespace in zero-chan
g
e
diffstat l
i
nes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Jeff King
a
void whitespace on empty
l
ine i
n
a
utomatic usag
e
message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Jeff King
mask necessary whitespace pol
i
c
y
violatio
n
s
in test
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-14
Je
f
f King
fix whitespace
violation
s
in
te
s
t scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-06-13
Je
f
f King
document --pretty=tfo
r
mat: op
t
i
on
commit
|
commitdiff
|
tree
2008-06-04
Jeff K
i
ng
Fix "git clone htt
p
://$URL" to check
o
ut the w
o
r
kt
r
ee
.
.
.
commit
|
commitdiff
|
tree
2008-05-28
Je
f
f King
clone:
make sure we suppo
r
t the
t
ransport
t
ype
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-21
Jeff King
send-em
a
il: rfc2047-quote sub
j
ect l
i
nes with non-a
s
cii
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-21
Jeff K
i
n
g
send
-
em
a
i
l
:
specify content-ty
p
e of --compose body
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-20
Jeff
King
git-am:
f
i
x typo in usage m
e
s
s
age
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-20
Jeff King
doc/git-daemon: s/upload
a
rchiv
e
/uploadarch/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
J
e
ff
K
i
n
g
filt
e
r-b
r
anc
h
: fix
variabl
e
e
x
port logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
Jeff King
clone: bsd shell p
o
rta
b
ility
f
ix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
Je
f
f
K
i
ng
t
50
0
0: tar
p
ortability fix
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-14
Jeff King
fix bsd shell negation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-08
J
e
ff King
d
o
c
:
c
l
arify definition of "upd
a
te" for git-add -u
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-04
Jeff Ki
n
g
checkout
:
don't rfc2047-
e
ncode oneline
o
n detache
d
.
.
.
commit
|
commitdiff
|
tree
2008-05-03
Jeff King
diff: make "too many fi
l
es"
r
ena
m
e war
n
i
ng option
a
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-03
Jef
f
King
bump
r
e
na
m
e limit def
a
ults
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-05-03
Je
f
f King
add m
e
r
g
e
.
r
e
n
a
melimit config option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-30
J
eff
K
i
ng
Docume
n
tation: po
i
nt
git-pru
n
e user
s
to g
i
t
-
g
c
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-30
Jeff King
cvsimport: al
w
ays pass user data
t
o "syste
m
" a
s
a list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-30
J
e
ff King
fix reflog approxidate parsing bug
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-25
Jeff King
r
e
mote: create fetch
c
onfig lines with '+'
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-25
Jef
f
King
push: al
l
o
w
u
nqualified dest refspe
c
s
t
o DW
I
M
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-25
Jeff Kin
g
doc/git-gc: add
a
note about what is collected
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-23
Jeff King
t5516: r
e
move
ambiguity te
s
t (1)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-23
Jeff
K
ing
Don't force imap
.
host t
o
be set wh
e
n imap
.
tunnel is
se
t
commit
|
commitdiff
|
tree
2008-04-10
Jeff King
g
it-rem
o
t
e
: show all remotes
w
i
t
h "git r
e
mote show"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-10
Jeff
King
git-fetch: alway
s
show statu
s
o
f non-t
r
a
cking-ref
f
etches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-04-10
Jeff King
g
it-fetch: fix status output when not storing
t
r
acking
r
ef
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
Jef
f
King
add
-
-interactive: a
l
low user t
o
choose mode updat
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
J
e
f
f King
add--i
n
teracti
v
e: ignore
m
ode change in 'p'atch command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-27
J
e
ff King
Docum
e
ntation: clari
f
y
use
o
f
.
gi
t
{
ignore,attributes
.
.
.
... but gratuitously reworded by
Jeff King
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-15
J
e
ff King
t6000lib:
r
e-fix tr
p
or
t
abi
l
ity
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next