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
Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maint
2011-04-29
J
eff King
m
erge
-
one-file: fix broken merge
s
w
ith alterna
t
e
w
ork
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
i
ng
ad
d
test
s
for merge-index / merge-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: quote rf
c
822 specials in em
a
il
a
ddresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff
K
i
n
g
upload-pack: start
p
ac
k
-ob
j
e
c
t
s
b
efore asy
n
c rev-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff
Kin
g
stash: drop dirty
worktree che
c
k
on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
ng
stash: fix accidental a
p
ply of
non
-
e
xistent st
a
shes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jef
f
Kin
g
pul
l
: do not clobber u
n
t
racked fi
l
es on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
d
o
c
s
:
fix filter-branch subdir example for exotic repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Je
f
f King
rem
o
t
e
:
depr
e
cate --mi
r
ror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jef
f
King
r
emote:
separate the co
n
ce
p
t
of
push and fetc
h
mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Je
f
f King
r
e
mot
e
: disallow so
m
e nonsensic
a
l option com
b
inatio
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
tests: kill backgrounded processe
s
m
ore robu
s
t
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
p
ull: do not clobber untracked fil
e
s on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
m
e
rge:
m
erge
u
n
born i
n
dex before setting re
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t76
0
7: clean
u
p
stray
u
nt
r
a
c
ked file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t76
0
7: mark
known breaka
g
e in test 11 as fixe
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
b
i
sect: vis
u
a
l
ize wi
t
h git-l
o
g if gitk is unavailable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
e
ff
King
c
h
e
ckout: tweak detach
e
d-orphan
w
a
rning format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff
K
in
g
checkout:
clear commit marks afte
r
d
e
t
ached-orp
h
an
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
e
ff King
checkout: add basic
te
s
ts for
d
e
t
ached-orphan warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jef
f
K
ing
docs: point git
.
txt au
t
hor credits to git-scm
.
com
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: add m
i
ssing git
footer
s
commit
|
commitdiff
|
tree
2011-03-11
Jeff K
i
ng
d
o
c
:
drop
a
ut
h
or/d
o
cumentati
o
n sect
i
ons from most
pages
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace
:
give
repo_setup trace i
t
s own
key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f King
add packet tracing
deb
u
g co
d
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f King
tra
c
e: add trace_
s
trbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff King
trace: fa
c
tor out
"
do we want to trac
e
" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
ing
trace: refactor
t
o
support m
u
ltiple env va
r
iable
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
King
trace: add t
r
ace_vp
r
intf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
strbuf: a
d
d strbu
f
_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
compat: provide a f
a
llback va_
c
opy definition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff
King
f
ormat-patch: rf
c
2047-encode newlines
i
n headers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
format-patch: wrap long h
e
ader lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Je
f
f King
strbuf: add f
i
xe
d
-le
n
gth v
e
rsion of add_wrapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff: do
n
't retrieve binary blobs
f
o
r diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
J
e
ff King
d
iff: handle diffstat of rewri
t
ten binary files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pull: pr
o
pa
g
ate --p
r
ogress to merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
f
f King
merge: enable p
r
ogress repor
t
ing for re
n
ame
de
t
ection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
ad
d
inexact rename detection progr
e
ss
i
nfrastruc
t
ure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Je
f
f
King
commit
:
stop
s
e
ttin
g
rename limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
ff
K
in
g
bump
rename lim
i
t
defaul
t
s (ag
a
in)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
m
erge:
i
mprove inexact rename lim
i
t warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff King
clone: die
w
he
n
trying to clone missing l
o
cal path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff K
i
ng
s
t
r
ing_list_append: always
s
et util pointer to
N
ULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff
K
ing
te
s
ts: s
a
n
i
tize m
o
re gi
t
e
n
v
i
r
onment variabl
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f
King
reba
s
e:
give a better
e
rror message for bogu
s
b
r
anch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
eff King
rebase: use ex
p
licit
"
--" with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
docs
:
explain diff
.
*
.
binary option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff Kin
g
i
d
e
n
t
:
die
on bogus date
format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
t2107
:
mark
p
a
ssi
n
g test as success
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff Kin
g
handle arbitrary ints i
n
gi
t
_co
n
fig_maybe
_
b
ool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
J
eff Ki
n
g
te
s
t
s
: flip execut
a
ble bit
on t
9
1
5
8
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff King
tests: add some scrip
t
lint c
h
ecks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
J
e
ff King
default color
.
stat
u
s
.
bra
n
ch to "same a
s
header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jef
f
K
ing
docs: default
to more
modern to
o
lse
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
reflo
g
s
: clear flags properly in
c
o
rner case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
a
llow command-specific pag
e
rs in pager
.
<cmd
>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
log
.
de
c
orate: accept 0/1 b
o
ol values
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Je
f
f King
d
o
cument sigchain api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Jeff Ki
n
g
docs: give more h
i
nts about
how "add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jeff King
d
o
cs: cla
r
ify git diff
m
o
des of operation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jeff King
a
p
ply: don't se
g
fault on binary file
s
with missing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff K
i
ng
diff: report
b
og
u
s input to -C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
config: tre
a
t no
n
-ex
i
stent config
fil
e
s
as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff Kin
g
docs
:
give more hints about how "add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jef
f
Ki
n
g
p
u
sh: pass --progress down t
o
git-p
a
ck-object
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
tests:
t
e
st terminal output to
b
oth s
t
dou
t
and stderr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
tests: f
a
ctor ou
t
terminal h
a
n
dl
i
n
g
from
t
700
6
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
J
eff
King
rev-li
s
t: ha
n
dle
%x00 NUL in user format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Jeff King
prefer test -h
over test -L
in shell scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
J
eff Ki
n
g
d
i
ff: don't use pathname-based diff dr
i
ver
s
for symlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
tests: make
test_must_fail
fail on missing comma
n
ds
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jef
f
King
t
e
sts: make
test_must_fail more verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Jeff K
i
ng
pass "git
-
c
foo=bar" pa
r
am
s
thr
o
ugh environ
m
en
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff Kin
g
do
c
s: fix M
a
kefile dependency for
use
r
manu
a
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
t
e
st-dat
e
: fix sscan
f
ty
p
e c
o
nvers
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
par
s
e
_
d
a
t
e: f
i
x
sig
n
ed
n
ess in timezone cal
c
ula
t
i
o
n
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
J
e
ff King
t0006: test timezo
n
e parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jeff King
no
t
es:
c
heck
n
umber of paramet
e
rs to "g
i
t
not
e
s
copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff K
i
ng
Makefile:
d
efault pager
o
n
A
I
X to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
comm
i
t: give adv
i
ce on empty amend
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff
K
in
g
Makefile: default
p
ager on
AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff K
i
ng
pull: do nothing
on -
-
dry-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff Kin
g
remo
v
e over-eage
r
caching in sha1_file_name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jef
f
King
d
ecode file:// and ssh:// U
R
Ls
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
J
eff King
make url-
r
elated functions reusable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
Jeff King
docs: c
l
arify meaning of
-
M
f
or git-log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff
King
t
e
sts:
c
hmod +x
t51
5
0
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
tests: renam
e
dup
l
ic
a
t
e
t
420
5
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff
K
i
ng
handl
e
"
git --b
a
r
e init
<
d
ir>" properly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jeff King
r
e
base-in
t
eractive: silence warning wh
e
n no commits
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
J
e
f
f
King
diff: use
l
arge i
n
teger
s
for
diff
s
t
at calculatio
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-09
Jeff King
script with rev-list
instead of log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Jeff King
docs: cl
a
r
ify "bran
c
h
-
l"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-07
Jeff
K
i
ng
fix typos and g
r
ammar
i
n 1
.
7
.
1 d
r
aft release
n
otes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
eff King
diff:
a
v
o
id u
s
eless f
i
l
e
s
pec
population
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
eff
King
diff: cache textco
n
v output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
e
f
f
King
textconv: refacto
r
c
a
lls t
o
run
_
textconv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
eff King
introdu
c
e note
s
-cache interfac
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
m
a
ke
c
ommit_tree a library
f
uncti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next