repo.or.cz
/
git
/
dscho.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-dependency' into maint
2011-04-29
Jef
f
Kin
g
mer
g
e-
o
ne-file
:
fix br
o
ken merges
with alt
e
rnat
e
wor
k
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
King
add tests for
merge-index
/ merge-o
n
e-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pr
e
tty
:
q
u
ote
r
f
c
822 spec
i
als in email addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
u
pload-pac
k
: start
p
ack-objects bef
o
r
e
a
sync rev-lis
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
st
a
sh: drop di
r
t
y
worktree
c
h
e
ck on
a
pply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Ki
n
g
stash:
f
ix accidental app
l
y
of non-ex
i
stent
s
ta
s
hes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Je
f
f
K
ing
pull: do not c
l
obber
untra
c
ked
f
i
l
es o
n
initial
pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
docs:
fix filter-
b
ran
c
h
sub
d
ir examp
l
e f
o
r exotic
r
epo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff Kin
g
remot
e
: deprecate --
m
irror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
K
ing
remo
t
e: se
p
arate the concept of
p
ush and fetch
m
irrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
eff
K
i
n
g
r
e
m
o
te: disallow some nonsensic
a
l op
t
ion comb
i
nat
i
ons
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
eff King
te
s
t
s: k
i
l
l
backgrounded proc
e
sses mo
r
e robustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
K
ing
pull: do n
o
t clobber untracked files on initial p
u
ll
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff Ki
n
g
merg
e
: me
r
ge unb
o
rn index b
e
fore setting r
e
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607:
c
lean up stray untracked
f
i
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
f
f
Kin
g
t760
7
:
mark k
n
own breakag
e
in test 1
1
as fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff K
i
ng
bi
s
ect: vi
s
ualize
w
ith gi
t
-log if git
k
is u
n
available
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff
Ki
n
g
checkout: tweak d
e
tach
e
d-orpha
n
warning
format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
e
ff
K
ing
che
c
kout:
c
lear
c
ommit mark
s
after detached-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checko
u
t: add basic te
s
ts for detached-orp
h
an warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff
K
ing
docs
:
point
g
i
t
.
t
x
t author credi
t
s
to git-scm
.
co
m
commit
|
commitdiff
|
tree
2011-03-11
Je
f
f King
doc: add
m
i
ssi
n
g git foo
t
ers
commit
|
commitdiff
|
tree
2011-03-11
Jeff Ki
n
g
doc
:
dr
o
p author/documentation sections f
r
o
m
m
o
st pages
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff King
trac
e
: give repo_setup trace i
t
s own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff King
a
d
d p
a
cket
t
ra
c
ing debug
c
ode
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
K
in
g
trace: add trace_strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
K
i
n
g
trace:
f
actor o
u
t
"
d
o we want to trace" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
f
f
King
t
r
a
c
e
: refactor to support mu
l
tiple
env varia
b
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
King
trace:
a
dd tr
a
ce_v
p
rin
t
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
strb
u
f:
a
dd strbu
f
_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff Kin
g
c
ompat: provide a fallback v
a
_copy definition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff Ki
n
g
format-patch: rfc2047-e
n
code newlines in head
e
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
f
o
rmat-pat
c
h: wrap long header lin
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
strbuf: add
f
ixed-lengt
h
vers
i
on of add
_
wrapped_te
x
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff
Kin
g
diff:
d
on't re
t
rieve binary blobs for
d
iffst
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff Ki
n
g
diff: hand
l
e
d
iffstat of
r
ewritten bina
r
y files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pull: pro
p
agate
-
-pr
o
gress to m
e
rg
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
m
erge: ena
b
le
prog
r
ess
r
epo
r
ting for rename d
e
t
ection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
K
i
n
g
add i
n
exact re
n
ame detecti
o
n
p
rogress infrastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
King
co
m
mit: stop se
t
ting
rename limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
ff Kin
g
bu
m
p
r
ename limit d
e
faults (again
)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
K
ing
merge: improve i
n
exact
rename limit warnin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
J
eff King
c
lone: die w
h
en tr
y
ing to clone
missi
n
g local path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff
K
ing
string
_
list_append: always
se
t
util pointer to
N
U
LL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
eff King
test
s
: sa
n
itize more gi
t
en
v
i
ronm
e
n
t variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Kin
g
rebase:
give
a better
error mess
a
ge for bog
u
s br
a
nch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase
:
u
se explicit
"
-
-"
with c
h
eckout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff K
i
ng
docs: explain diff
.
*
.
bina
r
y opt
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
J
e
ff King
ident: die o
n
b
o
g
us date
f
o
r
ma
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
e
ff Ki
n
g
t2107: mar
k
passing te
s
t
as su
c
cess
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
e
f
f King
handle arbitrary ints i
n
g
i
t_config_ma
y
be_bool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
J
eff King
tests: fl
i
p executable bi
t
on t
9
158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jef
f
King
te
s
t
s: ad
d
s
o
m
e script lint checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff
Ki
n
g
defaul
t
color
.
st
a
t
u
s
.
branch
to "same
a
s hea
d
er"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
J
eff King
docs: default to more
modern t
o
olset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff Ki
n
g
re
f
lo
g
s: clear flag
s
prope
r
ly in corn
e
r
ca
s
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
allow command-specific pagers i
n
pa
g
er
.
<
c
md>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
lo
g
.
d
e
corate:
a
c
cept 0/1 bool value
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Jeff Kin
g
document sigchain api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
J
e
f
f King
docs: give m
o
re hints about how "add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jeff King
d
o
cs: clari
f
y
git d
i
ff mode
s
o
f
o
p
eration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jef
f
King
apply: don't segfaul
t
on
b
i
nary
f
iles wit
h
missing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff K
i
ng
d
i
f
f
:
report bogus i
n
put to -
C
/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
J
e
ff Kin
g
c
onfig
:
treat
non-existent config
f
i
les as em
p
ty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
J
eff King
d
ocs: give more hints abou
t
how "add
-
e
" wor
k
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
push: pas
s
--progress down t
o
git-pack-objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
tests: test terminal o
u
tput to both stdout an
d
s
t
d
err
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
tests: factor out termin
a
l ha
n
dlin
g
from t7
0
06
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff
King
rev-li
s
t: handle %x00 NU
L
in user format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Jeff Ki
n
g
p
r
efer test -h ov
e
r test -L in she
l
l scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
J
e
ff King
d
iff: don't use pathname-based diff drivers
f
or symlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff K
i
ng
test
s
:
m
ake te
s
t_must_fai
l
fail on mi
s
sin
g
command
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
J
e
ff King
te
s
ts: make test_m
u
s
t
_
fail more
ver
b
o
se
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Je
f
f Kin
g
pass
"
git -c foo=bar
"
params t
h
r
o
ug
h
e
nv
i
ron
m
ent
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff King
d
ocs: fix Makefi
l
e dependency for us
e
r manu
a
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff Kin
g
test-date:
f
ix
sscanf t
y
pe conversion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
parse_date:
f
ix
s
ignedness in timezone
c
alculatio
n
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Je
f
f
King
t
0
006:
t
est
timezon
e
parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jeff
K
ing
notes: check number
o
f p
a
rameters to "git notes copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jef
f
King
Makefile: def
a
ult pager on AI
X
to
"more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
J
e
ff
K
in
g
c
ommi
t
: give ad
v
ice on
e
mpt
y
amen
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff
K
ing
Make
f
i
l
e
:
d
efault pager on AIX
to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff Kin
g
pull: do
n
ot
h
ing on --dry-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
remove ov
e
r-eager caching in
s
ha1_file_
n
ame
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
J
e
ff King
deco
d
e file:// and ssh:// UR
L
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff King
make url-related funct
i
ons r
e
usable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
J
eff King
docs: cla
r
ify meaning of -M for git-log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
tests:
c
hmo
d
+
x
t5150
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff
K
ing
t
es
t
s: rename dupli
c
ate t4205
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
J
e
ff Ki
n
g
handle "git --
b
are i
n
it <dir
>
" properly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
J
e
ff King
r
e
bas
e
-interactive: si
l
ence warning w
h
en n
o
c
ommit
s
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Jeff King
d
i
ff: us
e
l
a
rge
i
ntegers fo
r
diffstat calculations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-09
J
e
ff King
s
cript with r
e
v-list
instead of log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Jeff
K
ing
docs
:
c
l
a
r
i
f
y
"b
r
a
n
ch -l"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-07
J
e
ff King
fix typos and grammar
in 1
.
7
.
1 draft release
n
ot
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
di
f
f: avoi
d
useless fi
l
espec pop
u
l
ati
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
diff: cache textconv o
u
tpu
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff
K
ing
t
extco
n
v: refactor
c
alls to run_textco
n
v
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
e
f
f
King
intr
o
duce no
t
es-cache int
e
rf
a
ce
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Je
f
f King
ma
k
e
commit_tree a library
func
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next