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-recursive: Split was_tracked() out of would_lose_untracked()
2011-05-27
J
eff King
doc
s
: fix some anti
q
ue exa
m
p
l
e o
u
t
p
u
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs
:
mak
e
sure li
t
eral "->" isn't converted to arrow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
King
d
o
c
s: update
s
t
atu
s
--
p
orcel
a
in
format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
J
ef
f
King
docs
:
min
o
r grammar fixes to gi
t
-
s
t
atus
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
Jeff K
i
ng
read_gitf
i
le_gently: us
e
s
size_t
t
o hold read
r
esult
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
Ki
n
g
config:
always parse GI
T
_CONFIG_
P
ARAMETERS duri
n
g gi
t
_
c
onfig
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_confi
g
: don't peek at global config_parameter
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jef
f
King
c
o
n
f
i
g
:
make
e
nvironm
e
nt parsing routines static
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Je
f
f
King
tes
t
core
.
git
p
roxy configurat
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send-pack: avoid deadlock on git:// push
wit
h
fail
e
d
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
connect: let callers kno
w
if connec
t
ion is a sock
e
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
connect
:
treat gener
i
c proxy processes
l
i
k
e ssh processes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff
K
ing
t
3503:
test c
h
erry
p
i
cking and
r
everting
r
oot commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
revert: allow
reverting a root c
o
mmit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry-pick
:
handle root commits with external strateg
i
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff
K
in
g
send-pack: unbreak push over s
t
a
t
eless rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
King
merge-one-file:
fix broke
n
merges
w
i
t
h alternate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
ad
d
tests for merge-index / merge-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff Kin
g
pretty:
q
uot
e
r
fc822 speci
a
l
s in
e
mai
l
addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
upload-pack
:
st
a
rt p
a
ck-obj
e
cts before
a
sync
rev
-
list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
ng
stash: dro
p
d
i
rty
w
o
rktree check
o
n apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: fix accidental a
p
ply of non-existent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jef
f
K
ing
pull: do no
t
clobber untracked files
o
n initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
J
eff King
d
ocs: fix fil
t
er-b
r
a
nch su
b
dir example for exotic repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
K
ing
remote: deprecate --mir
r
or
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
r
emote: separate the
concept of
push a
n
d fet
c
h mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote: di
s
a
l
l
ow some nons
e
nsic
a
l option co
m
binations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jef
f
King
tests:
kill ba
c
kgr
o
unded processes
m
o
r
e
ro
b
us
t
ly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pull: do n
o
t cl
o
bb
e
r untr
a
c
k
e
d
f
iles on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
f
f
King
m
e
rge: merge
u
nborn index before se
t
ting
ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff Ki
n
g
t7607: cl
e
an up
stray untracked file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
K
i
ng
t
7
607:
m
ark kn
o
wn breakage in
t
e
st 11 as f
i
xed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jef
f
King
bisec
t
:
v
isualize with git-l
o
g if
gitk
is
u
navai
l
a
b
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Je
f
f
K
ing
ch
e
ckout: t
w
eak de
t
ached-orph
a
n warning format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff Kin
g
checkout:
c
le
a
r
co
m
mit mark
s
after detac
h
ed-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: add basic tests for detached-orph
a
n
warnin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
d
ocs: po
i
nt
g
i
t
.
tx
t
a
u
tho
r
credits t
o
g
i
t-scm
.
com
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: add missing git footers
commit
|
commitdiff
|
tree
2011-03-11
Jef
f
Kin
g
doc: drop au
t
h
or/
d
ocumentatio
n
sections from mos
t
pages
commit
|
commitdiff
|
tree
2011-03-08
Jeff Kin
g
trace: g
i
v
e r
e
p
o_setup trace its own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
add packet tracing deb
u
g code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Ki
n
g
t
race: add
trace
_
s
trbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f King
tr
a
ce:
factor out "do we want to tra
c
e"
l
ogic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Kin
g
trace: refa
c
tor to suppo
r
t mu
l
tiple env variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
ing
trace:
add trace_vprintf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff K
i
ng
strbuf: a
d
d strbuf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
compat: provide a
fallback va_co
p
y
definition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff K
i
ng
format-
p
atch: rfc204
7
-
e
ncode
newline
s
in
headers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff
K
ing
format-patch:
w
rap lo
n
g
header lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
st
r
buf: add fixed
-
leng
t
h version of
add
_
w
r
apped
_
text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff Kin
g
di
f
f: don't
retrieve
b
in
a
ry blobs
f
or di
f
fs
t
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
J
e
ff K
i
ng
diff:
handle d
i
ffstat of
r
ewri
t
ten b
i
nary
f
iles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pul
l
: prop
a
gate --progress to m
e
rge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge: enable pr
o
gress reporting for rename d
e
tec
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
a
d
d in
e
xact rename detec
t
ion
progress infrastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
c
o
m
m
it: sto
p
sett
i
ng renam
e
limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff Kin
g
b
u
m
p rename limit
defaults (again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff King
m
erge: improve inexact rename lim
i
t warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff King
clone: die when trying to clone missin
g
local path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff King
string_list_append: alw
a
ys set uti
l
pointer to N
U
LL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff
K
in
g
tests: sanitize more git environment variabl
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: give a better error message for bogus branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase:
use explicit
"--" with checko
u
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jef
f
Kin
g
docs
:
explain
d
iff
.
*
.
bina
r
y
o
ption
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff
King
ident: die on
b
o
g
us date form
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
t2107: mark passing test as success
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff
K
i
ng
handle ar
b
itr
a
ry int
s
in
git_config_m
a
yb
e
_bo
o
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jef
f
K
i
ng
tests: f
l
ip e
x
ecutable b
i
t on t9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
J
e
f
f King
tes
t
s
:
add some scri
p
t lint checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff Kin
g
default co
l
or
.
status
.
br
a
n
ch to "same as
header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
do
c
s
: def
a
ult to m
o
re modern toolse
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Je
f
f K
i
n
g
r
e
flo
g
s: clear flags properly i
n
corner case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jef
f
King
al
l
ow co
m
mand
-
specific pagers in pa
g
er
.
<cmd>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
l
og
.
dec
o
rate: accept
0
/1
b
o
ol
values
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Jeff King
document
s
igcha
i
n api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Jeff King
docs: give more hints about how "
a
dd -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jeff King
docs: cl
a
r
i
fy
g
it diff modes of o
p
e
r
ation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jeff King
ap
p
l
y: don't se
g
fault
o
n
bina
r
y files with mi
s
s
ing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
diff: repo
r
t bogus input to -C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
J
eff King
config: tre
a
t
non-existent confi
g
files as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff
K
i
ng
doc
s
: give more
hints
a
b
o
ut how "a
d
d -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
p
ush
:
pass --
p
rogress dow
n
to git-pack-
o
bject
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Je
f
f
K
ing
tests: test
t
erm
i
n
al output to both
s
t
dout and stder
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff Ki
n
g
tests:
f
a
ctor
out
term
i
n
al h
a
ndling
f
rom
t
7
00
6
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff
K
i
ng
rev-list: handle %
x
00 NUL in use
r
format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Jef
f
King
prefer
t
est -h over test -L
i
n
shell s
c
ripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
Jeff King
diff: don't
use pat
h
name
-
b
ase
d
diff d
r
ivers
f
or symlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Je
f
f King
tests: make test_must_fail fail
on missing commands
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
tests: ma
k
e
t
est_
m
ust_fail
m
ore verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Jeff King
p
ass
"
git -c
foo=bar" pa
r
ams throu
g
h environment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff K
i
ng
docs:
fix M
a
k
e
file dependency for user manual
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-
d
a
t
e: fix sscanf type c
o
nve
r
s
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jef
f
King
p
a
rse_date: fix signed
n
ess i
n
t
imezo
n
e calculation
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff Ki
n
g
t00
0
6: test time
z
one parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
J
e
f
f
K
i
n
g
notes: check number of
p
arameters to "git note
s
copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
M
ake
f
il
e
:
default
p
ager on AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
commit: give advice o
n
empty am
e
nd
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jef
f
King
Makef
i
le:
d
efault pager on AIX to
"m
o
re"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
pull
:
d
o
n
othing on --dry-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff Kin
g
remove over-e
a
ger cachin
g
in sha1_file_name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next