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 'jk/merge-one-file-working-tree' into maint
2011-04-29
Jeff King
m
erge-on
e
-fi
l
e:
f
i
x
b
ro
k
en merges wi
t
h a
l
ternate wo
r
k
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
Ki
n
g
add t
e
s
t
s f
o
r merge-i
n
de
x
/
merge-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
uploa
d
-pa
c
k:
s
ta
r
t p
a
c
k-objects before
async
rev-li
s
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Ki
n
g
s
t
ash: dr
o
p di
r
t
y worktre
e
c
h
eck on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: fix accidental apply of non-existent
stashe
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
pull:
d
o
n
ot clobber untr
a
c
k
e
d
files o
n
i
nitial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff
King
docs: fix filter-branch sub
d
ir examp
l
e
for ex
o
tic repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Je
f
f King
remote:
deprec
a
te
-
-mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
ff King
rem
o
te: separate the concept o
f
pus
h
a
nd fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff
K
ing
remot
e
: di
s
al
l
o
w
s
ome nonse
n
sic
a
l
o
ption com
b
in
a
tion
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff Kin
g
tests: kill
b
a
c
kgr
o
u
n
ded
p
ro
c
es
s
es
m
ore
r
obu
s
tly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
ff King
pull
:
do not c
l
obber untracked files on in
i
tial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
K
ing
m
e
rge: merge unborn i
n
dex befor
e
se
t
ting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff
K
i
ng
t7607: clean up s
t
ray untr
a
c
ke
d
f
i
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
eff King
t
7
607: mark known brea
k
age in test 11 as fixe
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
bisect: visualize with git-lo
g
if gitk is
unav
a
ilable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
eff
King
checko
u
t: tweak deta
c
hed-orp
h
a
n warnin
g
f
o
rmat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff
King
chec
k
o
u
t: c
l
ear
c
ommit marks after detac
h
e
d-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: add
b
asic
tests
f
or de
t
ached-orphan
warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
docs: point git
.
tx
t
author credit
s
to
g
it-scm
.
co
m
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: add missing g
i
t footers
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: drop
a
u
t
hor/documentation
sectio
n
s from most pages
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f
Kin
g
t
r
a
ce: give repo
_
setup trace its
o
wn key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Je
f
f King
add
p
acket tracing d
e
bug code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace:
a
dd trace
_
strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
eff
K
ing
t
race: factor out "
d
o we wan
t
to trace" lo
g
ic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
ing
trace: refactor to suppo
r
t multiple
env variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff
K
ing
trace: add tr
a
ce_vpri
n
tf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff
K
ing
s
t
rbuf: add s
t
rbuf_va
d
df
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jef
f
King
com
p
at: pr
o
v
ide a fallback va_copy defini
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
J
eff King
format-patch: r
f
c20
4
7
-en
c
ode n
e
wlines in header
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
fo
r
mat-patch: wrap long header lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
s
t
rbuf: a
d
d fixed-le
n
gth vers
i
o
n of add_wrapped_te
x
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
J
e
f
f
King
diff: do
n
't retri
e
ve bi
n
ary blobs for diffst
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Je
f
f King
di
f
f: handle diffstat of rewr
i
tten binary files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pull: propagate
-
-pr
o
gress
t
o merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
m
e
rg
e
: enable progress reporting f
o
r rename detection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
ff King
ad
d
inexact rename
d
ete
c
tion progr
e
ss infrastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
Kin
g
c
omm
i
t
:
stop setting rename
l
i
mi
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
King
bump rename limit defau
l
ts (ag
a
in)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
eff King
merge: impr
o
ve
i
nexact
r
ename l
i
m
i
t warnin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff K
i
ng
clone:
d
ie w
h
e
n trying to
clone
m
issing l
o
cal
path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff King
string_list_appe
n
d: always
s
et
util poi
n
ter
t
o NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f King
t
e
sts: sanitize mo
r
e git env
i
ronment variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
eff K
i
ng
re
b
a
se: give
a
better e
r
r
or message for
bogu
s
branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
reb
a
se: use explicit "-
-
" with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
J
e
f
f Ki
n
g
d
o
cs: ex
p
l
a
in diff
.
*
.
binary option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
J
e
ff
K
in
g
ident: die on bogu
s
date format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff
K
ing
t
2107: mark
p
assing test as success
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff
K
i
ng
handle arbitrary ints in git
_
c
o
nfig_maybe_bool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
K
i
ng
t
e
s
t
s: flip e
x
ecut
a
ble bit
o
n t91
5
8
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff
King
tests
:
add
s
ome script lint
checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff King
de
f
ault color
.
s
tatus
.
branch t
o
"same as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jef
f
King
do
c
s
:
default
t
o more mo
d
e
r
n
t
o
o
lset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff K
i
n
g
re
f
logs: clear f
l
a
g
s properly i
n
corner case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
J
eff K
i
ng
a
llow command-specific p
a
ger
s
in pager
.
<cmd>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff Kin
g
log
.
deco
r
ate:
a
ccept 0/1 bool values
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Jeff King
do
c
u
m
ent sigchain api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Jeff
K
i
ng
d
o
cs:
g
i
ve more hints
about how
"
ad
d
-e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jef
f
Kin
g
docs:
c
lar
i
fy git diff modes of op
e
ration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
J
e
ff
K
ing
a
pply: d
o
n't segfault on binary f
i
les with
missing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
diff: report bogus inp
u
t to -C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
config: treat n
o
n-existent
config
f
i
le
s
as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff Kin
g
doc
s
: give
more hin
t
s a
b
out how "add -e"
work
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff K
i
ng
push: pass --
p
rogre
s
s
d
own to git-p
a
ck-objec
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
t
ests
:
test terminal output to bot
h
stdout
an
d
stderr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff Ki
n
g
tests: f
a
ctor out termina
l
h
andling from t70
0
6
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff Ki
n
g
rev-list: handle %x0
0
NUL in u
s
er
f
ormat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Jeff King
prefer test -h
ove
r
te
s
t -L i
n
s
h
e
l
l
scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
Jeff King
diff: don't
u
se pathn
a
me-based d
i
f
f
d
r
i
vers for symlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff 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
te
s
ts: ma
k
e test_m
u
st_f
a
il more verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Jeff King
pass "git -c
foo=ba
r
" params through
e
nvironment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff
K
ing
docs: fi
x
Makefile dependency for
user m
a
n
ual
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
tes
t
-d
a
t
e
: fix sscanf type conversion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff
K
ing
parse_dat
e
: fix signedness i
n
tim
e
z
o
ne calculat
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
K
in
g
t0006:
t
est timezone parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jeff King
notes: check number of para
m
eters to "git n
o
tes copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff Kin
g
Makefile: default
p
ager on
AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
c
o
mmit: give advi
c
e o
n
emp
t
y amend
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff Kin
g
M
akefile: defau
l
t pa
g
er on AIX to
"more
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Je
f
f
King
p
ull: do nothing on --dry-r
u
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff
K
in
g
remov
e
o
ver-eager
caching i
n
sha1_file_name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
J
e
ff King
d
ecod
e
file:// and ssh:// URLs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff King
make url-rel
a
ted function
s
reusable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
Jeff King
docs: clarify meaning of -M for git-lo
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
tests:
c
h
m
o
d +x
t
5150
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff Kin
g
tests: rename duplicate
t
4
205
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
handle "git
--bare init <dir>
"
properly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jeff Kin
g
rebase-
i
nte
r
active: silence w
a
rning wh
e
n no
c
ommits
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Jeff King
diff: use larg
e
in
t
egers fo
r
diffstat calculations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-09
Jeff
K
ing
scrip
t
w
i
th rev
-
list instead of log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
J
eff King
doc
s
: clarify
"branch -l
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-07
Je
f
f K
i
ng
f
i
x
t
y
pos
a
nd grammar
i
n 1
.
7
.
1 dra
f
t release note
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
diff:
a
v
oid useless
f
i
les
p
e
c popula
t
io
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Je
f
f King
diff: cache tex
t
conv output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
textconv: r
e
f
actor calls t
o
ru
n
_te
x
tconv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
introduce notes
-
cache interface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
e
ff King
make co
m
mit_tree
a library fun
c
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff K
i
ng
fix text
c
onv
l
eak in emit_re
w
ri
t
e_diff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next