repo.or.cz
/
git
/
jnareb-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 'dm/http-cleanup'
2011-04-29
Jeff King
merge-on
e
-file: f
i
x broke
n
mer
g
e
s with alternate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
K
ing
add t
e
sts for merge-index / merge-
o
n
e-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff Kin
g
pretty: quote rfc822 sp
e
ci
a
l
s in email addresse
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Jeff King
f
o
rmat-
p
a
tch: wrap email
a
ddres
s
es after lo
n
g names
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-pa
c
k: start pack-o
b
je
c
t
s before async rev-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: drop dirty worktree
c
heck
on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
n
g
stas
h
:
fix accidental appl
y
of non-existent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
pull: d
o
no
t
cl
o
bber
untracke
d
files
o
n
i
n
itial
p
ull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
docs: fix filt
e
r-branch
s
u
bdir example for ex
o
tic repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Je
f
f
Ki
n
g
re
m
o
t
e: dep
r
ecate
-
-mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
eff King
re
m
ote: se
p
arate the
con
c
ept of push and fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
Ki
n
g
re
m
ote: d
i
sallow some nonsensical op
t
ion combinations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
eff King
test
s
: kill
b
a
ckgrounded processes m
o
re
r
obustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revision
.
c: m
a
ke
-
-no-notes reset --
n
o
t
e
s
li
s
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
r
e
vision
.
c:
support
-
-n
o
t
es c
o
mm
a
nd-line o
p
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jef
f
Ki
n
g
notes: refactor
d
i
splay notes
de
f
aul
t
handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff
King
note
s
:
refactor displ
a
y notes extra refs field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revis
i
o
n
.
c: ref
a
c
tor note
s
ref expansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
J
e
ff
K
ing
not
e
s:
make expand_notes_ref glob
a
l
ly accessible
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jef
f
King
p
u
ll: do not clobber untracked files on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
eff K
i
ng
merge:
m
erge
u
n
b
orn index before
s
e
tting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
K
i
n
g
t7607: clean up stray untracked file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: ma
r
k known break
a
ge in
t
est 11 as fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
bisect:
v
i
sualiz
e
wi
t
h git-log if
g
itk i
s
una
v
ailab
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Je
f
f
K
i
n
g
checkout: tweak
d
e
tached-orphan war
n
i
ng f
o
r
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
ch
e
ckout: clear commit marks after detached-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
check
o
ut: add basic
t
ests
for detache
d
-orp
h
an
war
n
in
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff
K
ing
docs: point
gi
t
.
txt author credit
s
to git-scm
.
c
o
m
commit
|
commitdiff
|
tree
2011-03-11
Jef
f
K
i
ng
do
c
: add
missing git foot
e
rs
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: dr
o
p author
/
do
c
umentation
sec
t
ions
f
rom
most pages
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
t
ra
c
e: give repo_setup trace its own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Kin
g
add packet tr
a
ci
n
g debug co
d
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
King
t
race
:
a
d
d trace_strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
King
trace:
fact
o
r
out "do we want
t
o
trace" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff Kin
g
tr
a
ce:
r
efactor to support multi
p
l
e env
v
ari
a
bles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
i
ng
tr
a
ce:
add trace
_
vprin
t
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
st
r
b
uf: add strbuf_v
a
ddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff Ki
n
g
compat: provide a fallback v
a
_copy
def
i
nition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
J
eff Kin
g
f
o
rm
a
t-p
a
tch: rfc2047-
e
ncode ne
w
li
n
es in he
a
der
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jef
f
K
i
ng
f
o
rmat-pa
t
c
h
: wrap long head
e
r lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff
King
strbuf:
a
dd fixed-leng
t
h v
e
rsion of add_wrapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff: don't retrieve binary blobs for dif
f
sta
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff: handle diffs
t
at of r
e
writt
e
n binary fi
l
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pull: propa
g
ate --progress
t
o merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge: enable progre
s
s r
e
p
o
r
ting for re
n
ame detection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
add
i
nexact rename det
e
ction p
r
ogress infrastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
c
ommit: stop setting ren
a
me limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
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
King
merge: improve
i
nexact rename limit warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
J
e
ff King
c
l
one
:
die when
t
r
ying to
clone missing loca
l
path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff Ki
n
g
strin
g
_
l
i
s
t_append: always
set
util pointer
t
o NUL
L
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jef
f
King
tests: sani
t
iz
e
m
ore git
e
nvironment variab
l
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Ki
n
g
rebase: giv
e
a b
e
tter
error message for bogus br
a
nc
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Ki
n
g
rebase: use explicit "--" with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
docs: explain diff
.
*
.
bin
a
ry opti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff Kin
g
ident: die
on bog
u
s date format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Je
f
f
Ki
n
g
t2107: mar
k
pas
s
i
n
g test as success
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff Ki
n
g
handl
e
arbitrary ints in g
i
t_config_maybe_bo
o
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
K
i
n
g
tests: f
l
ip execut
a
ble
bi
t
on t9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
J
eff Ki
n
g
t
e
sts: add so
m
e
script li
n
t checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jef
f
King
de
f
a
u
lt color
.
s
tatus
.
branch to "
s
ame as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff
K
ing
d
ocs: default
to more modern toolset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
reflo
g
s
:
c
lear flags prop
e
rly in corn
e
r c
a
se
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
allow
c
ommand-specific pa
g
ers i
n
pager
.
<cmd
>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff Kin
g
log
.
decorat
e
: accept 0/1
bool values
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
Jeff King
do
c
s: give more hints about how "add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jeff King
docs: clarify git d
i
ff modes of
o
p
e
r
ation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jeff Ki
n
g
apply: don't segfault on binary file
s
wi
t
h
m
i
ssing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
J
eff King
d
iff:
r
eport bogus input to
-C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff Kin
g
config: treat non-
e
xistent conf
i
g fil
e
s
as emp
t
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
docs: give
m
ore hin
t
s about
h
o
w
"
add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
push
:
pass --progre
s
s down to git-pack-objec
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
J
eff King
test
s
:
t
est te
r
minal output to both stdout and std
e
rr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff K
i
n
g
t
e
sts: f
a
cto
r
out
termina
l
handling from
t
7006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff King
rev-
l
ist: handle %x00
N
UL in user format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Jeff King
pref
e
r
test -h over test -L i
n
shell scri
p
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
Jeff
K
ing
d
iff:
don't use pathname-based di
f
f drivers for symlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
tests:
m
a
ke test_m
u
st_fail
f
ail on mis
s
ing commands
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
J
e
ff
K
ing
test
s
: make test_must_fail mor
e
ve
r
bose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Je
f
f King
pass "git
-
c foo=bar" p
a
rams through environ
m
en
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Je
f
f
King
d
o
c
s
:
fix Mak
e
file dependency for user
manual
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff
K
ing
test-date: fix sscanf type conve
r
s
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff
K
ing
parse_date
:
fix sig
n
edness in tim
e
zone c
a
lcula
t
ion
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
Ki
n
g
not
e
s: ch
e
ck n
u
m
b
e
r
o
f parameters to
"
g
it notes copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
J
eff Kin
g
Mak
e
file: default pager on AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
c
ommit: give
advice on empty amen
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff King
Make
f
ile: default pag
e
r on AIX to "more
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
pull
:
do n
o
thing on
--d
r
y
-
r
u
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
J
eff King
remove
o
v
e
r-eager caching in sha1_fil
e
_nam
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff
K
ing
decode f
i
le:
/
/ and ssh:/
/
URL
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
J
ef
f
King
mak
e
url
-
r
e
lated f
u
nction
s
reusable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
Jeff K
i
ng
docs: c
l
arify meaning of
-M for git-lo
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
J
eff King
tests: chmod +x t5150
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
tests
:
rename duplicat
e
t4205
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
handle "git
--bar
e
init <dir>" proper
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jeff King
reba
s
e
-int
e
ractive: silence
warning when no commits
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Jeff K
i
ng
d
i
ff: u
s
e large integers for dif
f
st
a
t c
a
lcu
l
ations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-09
J
e
ff
Ki
n
g
script wi
t
h rev-list instead of lo
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next