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 'jn/gitweb-js'
2011-05-24
Jeff
King
doc:
discuss textconv
ve
r
sus external
d
iff
d
rivers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
Make
f
ile: sort TEST_PROGRAMS list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
J
e
ff King
test core
.
gitproxy
c
on
f
igurati
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
send-pac
k
: avoid deadlock on
g
it:// push with fai
l
ed
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
K
i
ng
connect
:
let callers kno
w
if con
n
ection is a
socket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
n
g
connect: treat
g
eneric proxy proc
e
s
s
es like ssh
processes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503: tes
t
cherry
p
icking an
d
revertin
g
root commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert
:
allow reverting a root
co
m
mit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
ef
f
King
cherry
-
pick: handle root commits
w
ith
e
xternal strategi
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
J
eff
King
t7
5
01
.
8: fee
d
a meaningful command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
J
e
ff
K
i
n
g
b
l
ame:
add -
-
line-porc
e
lain outp
u
t format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
blame
:
refactor p
o
r
c
e
lain
o
utput
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-09
Jeff K
i
n
g
add tests for va
r
ious blame
for
m
a
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-pack: unbreak push over stateless
r
pc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
merge-one-file:
fix broken merges with
a
lternate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add test
s
for merg
e
-index / me
r
g
e
-
o
ne-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
J
e
ff K
i
ng
pretty: qu
o
te rfc822 specials in email addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Jeff
King
format-patch: w
r
a
p email addresse
s
after long names
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff
King
upload-pack: start pack-
o
b
jects be
f
ore async
r
ev-li
s
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash:
d
rop
d
ir
t
y w
o
rktree check on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jef
f
King
stash: f
i
x
accidental
a
pp
l
y of no
n
-existent
stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
J
ef
f
K
ing
pull: do not
c
l
obber
u
ntracked files o
n
ini
t
ial
pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
J
eff King
docs: fix
f
ilt
e
r-branch
s
ubd
i
r example
f
or
exotic repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff Ki
n
g
r
emote: depr
e
cate --mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote: separate the
co
n
cept of push and f
e
tch mir
r
or
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
King
remote:
d
isallow
some n
o
ns
e
nsical op
t
ion combinations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
eff King
tests: ki
l
l backgrounded processes more robustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff
K
i
n
g
r
e
vision
.
c
:
make
--no-notes reset
-
-notes list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f King
revi
s
ion
.
c: support --not
e
s command-lin
e
o
p
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f Ki
n
g
notes: re
f
a
c
t
or display notes defaul
t
handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
J
e
ff King
notes: refacto
r
display notes
extra
r
e
fs fi
e
l
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff K
i
ng
r
e
vis
i
on
.
c: refactor notes
r
ef
expansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Je
f
f King
notes: make
exp
a
n
d_notes_ref g
l
oball
y
acc
e
ssible
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
K
i
ng
p
u
ll: do not
clobb
e
r untracked files on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
eff King
mer
g
e
:
me
r
ge unborn in
d
ex before sett
i
ng
ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t760
7
: clean up st
r
a
y
u
ntracked file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: mark known
b
re
a
kage in test 11 as fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
J
e
f
f
King
bisect: visualiz
e
with gi
t
-log if gitk is u
n
avai
l
abl
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
check
o
ut: tw
e
ak d
e
ta
c
h
e
d
-o
r
p
h
an warning format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: clear c
o
mmit
m
arks after
d
e
tach
e
d-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
chec
k
out: add basic tests for detached-orphan wa
r
ning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff Ki
n
g
d
ocs: point git
.
txt author credits to git-scm
.
co
m
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc:
add missing git footers
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: drop auth
o
r/documen
t
ation sec
t
ions f
r
om most pages
commit
|
commitdiff
|
tree
2011-03-08
J
eff King
tr
a
c
e
: give repo_setup trace its own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f
K
i
ng
a
dd pack
e
t tr
a
cing debug
c
ode
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: ad
d
t
r
a
c
e
_strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: facto
r
out
"
d
o we
want to
t
r
ace" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trac
e
: re
f
actor to suppo
r
t
m
ult
i
ple env variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
i
ng
trace: add trac
e
_vprint
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Je
f
f
Kin
g
st
r
buf
:
add strbuf
_
v
a
dd
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jef
f
King
compat: provide a fallback
va_copy d
e
finition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
J
e
ff King
f
or
m
at-patch: rfc20
4
7-en
c
ode newl
i
nes in
hea
d
ers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff Ki
n
g
fo
r
mat-p
a
tch:
w
rap
l
ong
h
ead
e
r l
i
nes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
J
e
ff K
i
n
g
strbu
f
: add fixe
d
-
length version of a
d
d_wrapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff
K
ing
d
iff:
don't retr
i
e
ve bi
n
ary blobs
for diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
J
eff King
diff: handle diffstat of r
e
written binary file
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff K
i
ng
pull: pro
p
agate --p
r
o
gress to merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
Ki
n
g
merge
:
enab
l
e progress
r
eporting for re
n
ame detection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff Kin
g
add inexact rename detection p
r
ogre
s
s infrastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
King
com
m
it:
stop setting rename li
m
it
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
bump
r
ename
limit defaults (again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge: impro
v
e inexact rename
l
imit warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff Ki
n
g
clon
e
: d
i
e when trying t
o
clone m
i
s
s
ing l
o
cal path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
J
e
ff King
string_lis
t
_app
e
nd
:
alw
a
ys s
e
t util
p
oin
t
er to N
U
LL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
te
s
t
s
:
sanitize more git environmen
t
varia
b
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: give
a
b
e
tter error
m
es
s
age for bogus branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: use
explicit
"
--" with chec
k
ou
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
docs: exp
l
ain diff
.
*
.
binary
opti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff King
ident: d
i
e on bogus date form
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
e
ff King
t2107: mark passing test
a
s success
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff
King
handle arbitrary
i
nts i
n
git_config_
m
aybe_bool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff K
i
ng
test
s
:
f
lip
exe
c
utable bit on
t91
5
8
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
K
ing
tests: add some sc
r
ipt lin
t
checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff
K
ing
def
a
u
lt color
.
stat
u
s
.
bran
c
h to
"
same as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
J
e
ff King
docs: default to more modern toolset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
ref
l
ogs: clea
r
flags
prop
e
rly in corner c
a
s
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Je
f
f King
allow command
-
specific pag
e
rs in pager
.
<cmd>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff
K
ing
log
.
decorate: acce
p
t
0/
1
boo
l
va
l
ue
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Jeff K
i
ng
docum
e
nt sigchain
a
pi
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Je
f
f King
docs:
give more hints abou
t
how "add -e" wo
r
ks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jeff King
docs: clarify git dif
f
m
o
d
e
s of operatio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jeff King
apply
:
don't segfault
on bi
n
ary f
i
les wi
t
h
m
issing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff K
i
n
g
diff:
report
bogus input
to
-
C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jef
f
King
con
f
ig: treat non-e
x
istent
c
onfig files as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
J
eff Ki
n
g
docs: give more hints about
how "add -
e
" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
J
e
ff King
push: pass --progre
s
s down
to git-pack-
o
bje
c
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff
K
in
g
tests: test terminal ou
t
p
ut to bo
t
h
s
tdout and std
e
r
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff Ki
n
g
tests: facto
r
out terminal hand
l
ing from t7006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff King
rev-list: 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
o
ve
r
tes
t
-
L in she
l
l scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
Jeff King
d
iff: don'
t
u
s
e pathname-base
d
d
i
ff drivers for
s
ymlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Je
f
f King
tests: make te
s
t_must_
f
ail
fail on
m
issing c
o
mman
d
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
J
e
ff King
tes
t
s: mak
e
test
_
must_
f
ail
more v
e
rbo
s
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Jeff King
p
a
s
s
"git
-c foo=bar" params thro
u
g
h environ
m
ent
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff
K
i
n
g
docs: fix
M
akef
i
l
e
dep
e
ndency for use
r
manual
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jef
f
King
test-
d
ate: fix sscan
f
t
ype conversion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
J
eff
K
ing
parse_date: fix signednes
s
i
n
timezone calcula
t
i
on
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
t0006: test timezone parsin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jeff King
n
ote
s
:
check n
u
mb
e
r of
p
a
r
ameters
to "
g
i
t
no
t
es co
p
y"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next