repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tr/maint-merge-file-subdir' into maint
2009-09-06
J
e
ff K
i
n
g
push:
re-flow non-fast-forward message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
push:
fix eng
l
is
h
in non
-
fast-f
o
rwar
d
mes
s
age
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff
K
i
n
g
docs:
note
t
hat status confi
g
u
r
a
tion affects only
l
o
n
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
eff King
co
m
mit: suppo
r
t alternate status formats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
stat
u
s
:
add --porcelain output format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
status:
refa
c
t
o
r forma
t
option parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
s
tatus: refac
t
or sh
o
rt-mode p
r
int
i
n
g
to its own
fu
n
cti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
eff
King
st
a
tus
:
typo fix
i
n usage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
J
ef
f
King
push: teach --quiet to su
p
press "E
v
e
r
ything up-to-date"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff King
clone: disconnect transport after fetching
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
fix appro
x
id
a
te p
a
rsin
g
of
relative
months an
d
years
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff
K
ing
tests: add date printing
and p
a
rsing tes
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff
King
refactor test-date in
t
erface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff King
clone: add -
-
branch option to select a different HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
Jeff Kin
g
checkout: do not imply
"-f" on
unbo
r
n
b
ranches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
Jeff
K
ing
tests: d
i
s
a
b
l
e int
e
r
active hunk selection tests
i
f
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
J
e
ff King
docs: describe impac
t
o
f repack on "clone -s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
Jeff King
allow pull
-
-
rebase
on branch yet to be born
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff Kin
g
merge: indicate remote trackin
g
branches in m
e
rge message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
merge: fix
i
ncorrect me
r
ge mes
s
age for
a
mbiguous t
a
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
add t
e
sts for
m
erge m
e
ssage headings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jef
f
King
t
/Makef
i
le:
incl
u
de
co
n
f
i
g
.
mak
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
J
eff King
tests: allow user to specify trash directory location
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
t
e
s
ts: p
r
o
v
ide $
T
RASH
_
DIRECTO
R
Y variable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
t
e
sts: use
"
$
T
E
ST_DIRECTO
R
Y
" instead of
"
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
Jeff King
Makefile: git
-
http-fet
c
h
doe
s
not ne
e
d expat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
J
e
f
f King
transport: don'
t
s
how push status if --quiet i
s
given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff King
transpo
r
t: pass "qu
i
et" fl
a
g
t
o pack-objec
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff
King
push
:
add --
q
uiet fl
a
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-24
J
e
ff
King
send-emai
l
: detect c
y
c
l
es in alias
e
x
p
a
n
sion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff King
s
h
o
w
:
add sp
a
ce
b
et
w
ee
n
m
ulti
p
le items
Tagger:
Jeff King
<peff@peff.net>
Author:
Jeff King
<peff@peff.net>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff
King
sh
o
w: sup
p
r
ess extra newline when sho
w
ing annotated tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-09
Jeff King
Mak
e
fil
e
: i
n
s
t
all 'git' in execdir
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-01
Jeff King
log
-
tree:
f
ix confusing
comment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Jef
f
King
Makefile:
us
e
c
ompat regex on So
l
ar
i
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Jeff King
Makef
i
le: refactor regex compat sup
p
ort
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-31
Jef
f
King
g
i
t-
a
d
d: no n
e
ed for -f when resolving a conflict in
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix c
a
t-file u
s
age mess
a
ge and
doc
u
mentati
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
J
e
ff
King
fe
t
ch:
r
eport ref
s
t
orage DF errors
m
ore
a
ccurately
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff
K
in
g
lock_r
e
f: inform callers
o
f
u
navai
l
able ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
convert
ba
r
e readlink to
strb
u
f
_read
l
ink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Jeff
K
ing
fo
r
-e
a
ch-r
e
f: fix
s
e
gfault i
n
copy_email
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Je
f
f
K
ing
add:
don'
t
c
o
mplain when addi
n
g empty project root
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
King
fix GIT_TRA
C
E
s
e
gfau
l
t with shell-
q
uoted
ali
a
ses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
J
eff King
parseopt: add OPT_NEGBIT
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Je
f
f Kin
g
Makefi
l
e: fix NO_PERL bug w
i
th gitweb
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
Jeff K
i
ng
t
7800: respect NO_PERL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
J
e
ff King
add-in
t
eractive: re
f
ac
t
or mode hunk handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
Jeff
King
doc/g
i
tattributes: clari
f
y locat
i
on of
c
onfig text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
J
e
ff King
add-interactive: re
f
actor mo
d
e
h
u
nk han
d
ling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff
K
i
n
g
docs/checkou
t
: clarify what "non-bran
c
h
"
means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc/check
o
ut: split checkout
a
nd branch
c
rea
t
io
n
in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Je
f
f Kin
g
doc/checkout: refer to git-b
r
anch(1) as appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jef
f
King
do
c
:
refer to tracking configurat
i
on as "
u
ps
t
ream"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc
:
clarify --no
-
tra
c
k opt
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff K
i
ng
add
t
e
s
ts for remote groups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
test
s
: skip perl tests if NO_PERL is def
i
n
e
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
Makefile: allow
buildi
n
g witho
u
t
p
erl
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
e
f
f
K
ing
branch: s
h
ow ups
t
ream branch when double
verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
make
get_short_ref a public function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
e
f
f
K
ing
for-each
-
ref:
a
d
d "upst
r
e
a
m
"
forma
t
field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
e
ff Kin
g
f
or-each-ref: refactor
refname handli
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Je
f
f Ki
n
g
for-
e
ach-ref: refact
o
r
g
et
_
short_ref
f
unction
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests: re
m
o
v
e exit afte
r
tes
t
_do
n
e call
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
c
om
m
it: abort commit
i
f i
n
teract
i
ve ad
d
fai
l
ed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t1301: loose
n
test for forced modes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
J
e
ff King
f
i
x portab
i
lit
y
problem with
I
S_RUN_COMMA
N
D_ERR
commit
|
commitdiff
|
tree
2009-03-23
Jeff King
t
0
060: fix whitespace in "wc
-
c" invoca
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
J
ef
f
King
M
a
kefile: tu
r
n on USE_ST_
T
I
M
E
S
PEC
f
or FreeBSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
J
e
ff King
r
emote: impr
o
ve sorting of
"
c
o
nf
i
gure
f
o
r git push
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Je
f
f King
ls-f
i
le
s
: require
worktree when --deleted is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
Jef
f
K
ing
make oneline reflo
g
dates more co
n
sistent with m
u
ltil
i
n
e
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-19
J
e
f
f
Kin
g
doc:
c
la
r
ify how -S wo
r
ks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-17
Jeff
King
ls-files: require worktree when --deleted is
given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff King
ls-file
s
:
fix broken --no-empty-directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
Jeff K
i
ng
t
3
000: use test_cmp
inst
e
ad of diff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
document config --bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
c
onfig: set help text for
-
-bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff
King
t130
0
: use te
s
t_
m
ust_fai
l
as appr
o
priate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
Jeff
King
i
m
prove
missing repository e
r
ror messag
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
Jeff King
clone: ru
n
post-checkou
t
h
ook when checking ou
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
Jeff
K
ing
remote: m
a
k
e
g
u
e
ss_remote_hea
d
(
)
use
e
xact HEAD lookup
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
refactor find_ref_b
y
_name()
t
o
accept const list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff Kin
g
ad
d
basic htt
p
clo
n
e/fetch tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
test s
c
ripts
:
refactor start_httpd helper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-25
Jeff
K
ing
never fallback
rel
a
tiv
e
time
s
t
o
abso
l
ute
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff K
i
ng
add bas
i
c br
a
nch dis
p
lay test
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
J
e
f
f King
branch: clean up
repeate
d
str
l
en
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-14
Jeff King
sym
b
olic-
r
ef:
allow ref
s
/<whatever> in HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-04
Jeff Kin
g
valgri
n
d: igno
r
e ldso
and more libz err
o
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-30
J
e
ff King
t0
0
05: use
S
IGT
E
RM for
sig
c
hain
test
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Je
f
f
K
i
n
g
s
ymboli
c
ref: r
e
fus
e
n
on-
r
ef ta
r
ge
t
s in HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
Jeff King
validate_headre
f
: tigh
t
en
r
ef-matchi
n
g to just branche
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-29
J
e
ff King
avoid 31-bit truncatio
n
in w
r
ite_loo
s
e_object
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff Kin
g
git: use r
u
n_command() to execute dashed externals
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff K
i
n
g
r
u
n_command(): help calle
r
s distinguish errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
J
eff Kin
g
run_command(): han
d
le missing
command errors more gracefully
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-28
Jeff King
git: s
/
r
un_command/run_builtin/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Jeff
Kin
g
pager: do wait_for_pager
o
n s
i
gnal d
e
ath
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-22
Je
f
f Kin
g
ref
a
c
t
or sig
n
al
handling for
c
leanup
functions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next