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
Ki
n
g
merge-one-file: fix broken merges with alternate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
add t
e
s
t
s for merge-index / mer
g
e-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty
:
q
u
ote r
f
c822 specia
l
s in email addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-pack: sta
r
t pac
k
-ob
j
ec
t
s
b
efor
e
as
y
nc rev-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff
Ki
n
g
stash:
drop dirty
worktree c
h
eck o
n
a
p
p
ly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Kin
g
st
a
sh
:
fix acciden
t
al apply of non-e
x
istent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
p
ull: d
o
not clo
b
ber u
n
tra
c
ked files
on
i
nitial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
docs: fix filter-br
a
nch subdir example for exoti
c
repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jef
f
K
i
n
g
rem
o
te
:
deprecate --mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
f
f
K
i
ng
r
e
mote: separate
the
concept of push and f
e
tch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jef
f
K
i
ng
remo
t
e: disallow some nonsensi
c
al opt
i
on combin
a
tions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
King
t
e
sts: kill backgro
u
nded proces
s
e
s
more r
o
bus
t
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
f
f Ki
n
g
p
u
ll: do not cl
o
bber untracked files on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Je
f
f Ki
n
g
merge:
m
erge unb
o
rn index bef
o
re setting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t76
0
7: clean up str
a
y untracked fi
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
King
t
760
7
: m
a
r
k known breakage in test
11 as fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
bisect: vis
u
alize with git
-
log
if
g
itk
is una
v
ailable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jef
f
King
ch
e
ckout:
t
weak
de
t
ac
h
e
d
-orphan warning
f
o
rmat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: clear commit
m
arks after d
e
tached-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
ef
f
King
checko
u
t: add basic tests for detached-orphan
warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jef
f
Kin
g
docs: point
g
it
.
txt auth
o
r cre
d
i
ts to git-sc
m
.
co
m
commit
|
commitdiff
|
tree
2011-03-11
Jeff
King
d
oc
:
a
d
d
missing git footers
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc
:
dro
p
author/document
a
tion
s
e
c
tion
s
from most
pages
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f King
trace
:
give
r
e
po_s
e
tup trace its
o
w
n k
e
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff King
add
p
acket tracing debug code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Ki
n
g
t
race: add tr
a
ce_st
r
buf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
King
trac
e
:
factor out
"
do we want to trace" l
o
gic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: refa
c
tor t
o
support multiple env vari
a
b
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: add tra
c
e
_vprint
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff Ki
n
g
strbuf: add strbu
f
_vadd
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff K
i
ng
compat: provide a fal
l
b
a
c
k va_
c
opy defini
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
J
eff
King
format-patch: rf
c
20
4
7-encode
n
ewlin
e
s in headers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
fo
r
mat-p
a
tch: wrap
l
on
g
header lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
J
eff
King
strbuf: add fi
x
ed-length ve
r
sion of add_wrapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
d
i
f
f
: don't retrieve binary blobs for
diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
J
ef
f
King
diff: handle diff
s
tat of re
w
ritten
b
inary
f
iles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Je
f
f King
pu
l
l: p
r
opagate -
-
pr
o
gress to merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
King
merge: enable prog
r
ess report
i
ng
f
or rename detecti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
K
i
n
g
add in
e
xact
rename
d
etection progress infrastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
c
o
mmit: stop se
t
ting
r
e
name limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff Kin
g
bump rena
m
e limit defaul
t
s (again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
Kin
g
m
e
rge
:
imp
r
ove in
e
xact renam
e
l
i
mit war
n
ing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff King
clone: die when tryi
n
g
to clone missing loca
l
path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Je
f
f Kin
g
st
r
ing_
l
ist_append: al
w
ays s
e
t ut
i
l pointer
t
o NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Kin
g
tests: sanitize
more gi
t
en
v
i
ronment variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff K
i
ng
reb
a
s
e: give
a
bet
t
er error messag
e
f
o
r
b
ogus bra
n
ch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
e
f
f King
rebase: use explicit "--
"
with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff
Ki
n
g
d
o
cs: expl
a
in diff
.
*
.
b
inary o
p
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff King
ident: die
on bogus
date for
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
t2107: mark passing test as s
u
c
c
ess
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff Kin
g
h
a
ndle arbit
r
a
r
y
i
nts in git_config_maybe_bool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jef
f
Ki
n
g
te
s
ts
:
flip executable b
i
t
o
n
t9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
Kin
g
tests
:
add some script lin
t
che
c
ks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
J
e
f
f
Ki
n
g
d
ef
a
ult color
.
s
tatus
.
branch to "same as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
docs: defau
l
t to more mode
r
n
t
oolset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
J
eff King
reflogs: clear flag
s
properly in
c
orner case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
allow comm
a
nd-specifi
c
pa
g
ers
i
n
pager
.
<c
m
d>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
log
.
d
ecorate: accept 0/1 bool va
l
ues
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Jeff King
document
sigchain api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Jeff King
docs
:
g
ive more hi
n
ts about how "add -e
"
works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
J
e
ff King
doc
s
: c
l
a
r
i
fy git di
f
f modes of
opera
t
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
J
e
ff King
appl
y
:
d
on't segfa
u
lt
o
n binary
files with
m
issing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
diff: report b
o
g
u
s
input
to
-
C
/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff
King
con
f
ig: treat non-e
x
istent config files as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
docs:
g
ive
m
ore hints abo
u
t
how "add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
J
e
ff King
push: pass --p
r
ogr
e
ss down to g
i
t-
p
a
c
k-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 st
d
out and stderr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
t
ests: factor ou
t
terminal ha
n
dling from t700
6
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff
King
rev
-
list: handl
e
%x00
NUL in user format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Jef
f
K
i
ng
prefer test
-
h
over t
e
s
t -L
in shell s
c
ri
p
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
Jeff King
diff
:
don
'
t use pathname-based diff driv
e
rs for symlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Je
f
f King
tests: make
t
est_must_fail
f
a
i
l
on mi
s
sing
c
ommand
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
t
e
sts: ma
k
e
test_must_fail more ver
b
ose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Jeff King
pass "git
-
c foo=bar" pa
r
ams through en
v
iron
m
ent
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff King
docs: fix Makefile dependency for user
manua
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff
K
ing
te
s
t-d
a
t
e: fix ss
c
anf ty
p
e co
n
versi
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jef
f
Ki
n
g
parse_date: fix
s
ign
e
d
ne
s
s
in timezon
e
calculation
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jef
f
King
t0006:
test ti
m
ezo
n
e parsi
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jeff King
not
e
s
:
check
n
umbe
r
of pa
r
ameters to "git notes co
p
y"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Je
f
f
K
ing
Makef
i
le: def
a
u
l
t
pager o
n
AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff Ki
n
g
commi
t
: give advic
e
o
n
empty amend
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff
K
ing
M
a
k
efile: default pa
g
e
r on AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
pull
:
d
o
nothing on --dr
y
-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff Kin
g
remove over-eage
r
c
aching i
n
sha1
_
file_name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff King
d
e
code fi
l
e://
a
nd s
s
h:// URLs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Je
f
f King
make url-related functions
reusable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
Jeff Ki
n
g
docs: clarify m
e
aning of -M
for g
i
t-lo
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff
Kin
g
tests:
c
hmod
+
x t5150
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
t
ests: re
n
a
m
e duplica
t
e t4205
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff K
i
n
g
handle "
g
i
t --ba
r
e
init
<dir>" prop
e
rly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jeff Kin
g
r
e
b
ase-interactive:
s
i
l
ence warning when
no commits
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Jeff King
diff: use l
a
rge integers for diffstat cal
c
ulati
o
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-09
J
e
ff
K
ing
script with rev-
l
ist instead of log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Jeff King
docs: cla
r
ify "branch -l"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-07
J
eff King
fix
typos and grammar
in
1
.
7
.
1 draf
t
release
n
otes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff K
i
n
g
diff: avoid usel
e
ss f
i
le
s
p
e
c
po
p
u
l
ation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff
King
dif
f
: cache te
x
tconv o
u
tput
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
e
ff King
te
x
tconv: re
f
actor call
s
to run_textconv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
e
f
f
King
introduce notes-cache interface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
mak
e
commit_tree a library function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next