repo.or.cz
/
alt-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 'sc/difftool-p4merge'
2009-11-09
Jeff King
form
a
t
-
p
a
tch: make "-p"
s
uppress diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
push: fi
x
t
ypo in
usage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
t
9
15{0,1}: use $TEST_DIRECTORY
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
ls-files: unbreak
"
ls-
f
iles -i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff King
a
d
d
-intera
c
tive: h
a
n
d
le d
e
leti
o
n of empty f
i
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Je
f
f K
i
ng
g
i
tig
n
ore: root mo
s
t patt
e
rn
s
a
t
the to
p
-level directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
Jeff King
pus
h
:
al
w
ays load
d
e
f
au
l
t config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
J
eff King
cvsimport: fix rela
t
ive
a
rgum
e
nt
f
ilenames
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff King
document push's new q
u
i
e
t opt
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Jeff King
l
s
-files: excludes shoul
d
not
impact
t
r
a
ck
e
d files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
J
e
ff King
pull:
i
m
prove
a
dvic
e
f
or un
c
onfigu
r
ed error
c
as
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
Jef
f
King
impro
v
e reflog date/number heurist
i
c
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
reba
s
e: use plumbi
n
g to show dirty
s
tate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
status: mak
e
"how to
s
tage"
m
essag
e
s optional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
push: m
a
ke non-fa
s
t
-forward help messa
g
e
c
onfigurable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
push: re-flow non-fa
s
t
-
forwar
d
m
e
s
sage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff Ki
n
g
p
ush: fix english in non-fast-forward m
e
ssage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff K
i
ng
push
:
teach --qu
i
e
t
t
o
suppr
e
ss "Everything
u
p-t
o
-
d
ate"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff K
i
ng
clone: dis
c
onnect
tran
s
port after fetch
i
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
fix approxidate parsing o
f
relative months and
y
ears
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
J
ef
f
Ki
n
g
tests: add date printing and parsing tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
refactor test-date interface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff King
clone: add
-
-branc
h
option t
o
selec
t
a different HE
A
D
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
Jeff
K
in
g
checkout: do not imply
"-f" on unborn
branches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
Jeff King
te
s
ts: disa
b
le interactive
hunk select
i
on tests
if
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
J
eff King
d
o
cs: d
e
scrib
e
imp
a
ct of rep
a
ck
o
n "
c
lo
n
e
-s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
J
eff
King
allow pull
-
-rebase o
n
branch yet to be born
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff
Ki
n
g
m
e
r
ge:
i
ndi
c
a
t
e remote t
r
acking branches in
merge m
e
s
s
a
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
merge: fix incorrect mer
g
e message for ambiguous tag
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
add tests for merg
e
message h
e
a
dings
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff K
i
ng
t/
M
akefile: in
c
lude conf
i
g
.
mak
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
tes
t
s: allow user
t
o specify tra
s
h d
i
rectory locatio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Je
f
f King
tests:
p
r
o
vide $TRASH_DI
R
E
C
T
ORY
v
ariable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jef
f
King
t
e
s
ts: use
"
$TEST_DIRECTORY" instead of "
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
Jeff King
Ma
k
e
f
ile: git-http-fet
c
h does not nee
d
expa
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff
K
ing
tra
n
sport: do
n
't show p
u
sh status if
--quiet
is given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
J
e
f
f
King
transport: pass "quiet" f
l
ag to pack
-
objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
J
e
ff King
push: ad
d
--quiet flag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-24
Jeff
K
ing
sen
d
-e
m
ai
l
:
detect cycles in alias
e
x
pansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff King
show
:
add space between
m
ultiple ite
m
s
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
show:
s
uppress extra newline when sho
w
in
g
annotated tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-09
J
e
ff Kin
g
Makefil
e
: inst
a
l
l
'
git' in
e
xe
c
dir
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-01
Jeff Kin
g
log-tree: fix confusing co
m
me
n
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Jeff King
Makefile:
use co
m
p
at regex on Solaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-06-18
Je
f
f
K
ing
Makef
i
le:
refactor
regex
compat sup
p
ort
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-31
Jeff King
git-add: no need
f
or -f
when resolving a conflict in
.
.
.
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix
c
a
t-f
i
le usage
m
essag
e
and doc
u
mentation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fetc
h
:
report ref st
o
ra
g
e DF
e
r
r
o
rs more accur
a
t
e
l
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
l
ock_
r
e
f
: info
r
m c
a
ller
s
of u
n
ava
i
l
a
ble ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-25
J
eff
K
ing
convert bare readlink to strbu
f
_re
a
dlink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-20
Jef
f
King
for-each-ref: fix segfa
u
lt in copy_email
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
a
d
d: d
o
n't complain when a
d
ding empty proj
e
ct root
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jef
f
King
fix G
I
T_TRACE segfault
w
i
t
h shell-quoted aliases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
par
s
eopt: add
OPT_NE
G
BIT
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-28
Jeff K
i
ng
M
akefile: f
i
x NO_PERL bug with gitweb
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-24
Jeff Ki
n
g
t
7
800: respect NO_PERL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-19
Jef
f
King
add-i
n
teractive
:
refactor
m
ode h
u
nk
h
a
ndling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/gitattrib
u
tes: c
l
arify lo
c
ation of config tex
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-16
J
e
f
f Ki
n
g
add-interact
i
ve:
refact
o
r mode hunk handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jef
f
King
docs/checkout: cl
a
rif
y
wha
t
"non-branch" means
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff Kin
g
d
o
c/checkout: split checkout an
d
branch
creation in
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff King
doc/
c
heckout:
r
efer
t
o
git-branch(1) as
approp
r
iate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
Jeff Kin
g
do
c
: ref
e
r to trackin
g
configuration as "upstream
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-13
J
e
f
f King
d
o
c: clari
f
y --n
o
-track opt
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
a
d
d
tests f
o
r
remote groups
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
Je
f
f
K
i
n
g
t
ests: sk
i
p perl test
s
if NO_P
E
RL is de
f
ined
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-09
J
e
ff King
Makefile:
allo
w
building wit
h
out
pe
r
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff K
i
ng
branch: show upstream b
r
anch when double
v
e
rb
o
se
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
make get
_
short_ref a public funct
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff
King
for-each-ref: add "
u
pstream" forma
t
field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
J
e
ff
King
for-each
-
ref:
refactor refname handl
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-08
Jeff K
i
ng
for-eac
h
-ref: refac
t
o
r
get_sho
r
t_ref func
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jef
f
King
tests: re
m
ov
e
exit after test_do
n
e
call
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-05
Jeff
K
ing
com
m
it: abort co
m
m
i
t if interac
t
i
v
e ad
d
failed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t
1
301:
loosen test for forc
e
d modes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
f
ix porta
b
ility problem w
i
th IS_RUN_CO
M
M
A
ND_ER
R
commit
|
commitdiff
|
tree
2009-03-23
Jef
f
King
t
0
0
6
0
: fix whitespace in "wc -c" inv
o
c
a
t
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-23
J
e
f
f King
Makefile: turn on
USE_ST_T
I
MESPEC for Fre
e
BSD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
J
ef
f
King
remote: improve sor
t
in
g
of "configure for
g
i
t
push
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-22
Jeff Kin
g
l
s
-fil
e
s:
r
equire worktr
e
e wh
e
n --d
e
leted is
g
iven
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-20
Jeff King
ma
k
e oneline reflog d
a
t
e
s more
c
onsistent
with mu
l
tili
n
e
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-19
Jeff Ki
n
g
doc: cla
r
if
y
how -S works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-17
J
e
f
f
K
ing
ls-files: require worktree
when
-
-deleted i
s
given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
J
eff King
ls-files: fix br
o
ken
--no-empty-directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-08
J
eff King
t
3
000
:
u
s
e
test_cmp
i
nstea
d
o
f
d
if
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
document config -
-
b
ool-or-
i
nt
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Je
f
f
King
config: set
h
e
lp te
x
t for
--bool-or-int
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-07
Jeff
Kin
g
t1300: use te
s
t
_must
_
fail as appropriate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-05
Jeff King
improve
m
i
s
s
i
n
g repo
s
i
tory
e
rror message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-03-03
Jeff King
cl
o
n
e: ru
n
post-
c
hecko
u
t hook wh
e
n
chec
k
ing out
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-27
Je
f
f King
rem
o
te: make gue
s
s_remot
e
_
h
e
ad()
use exact HEAD
l
oo
k
up
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
J
eff King
refactor
f
ind_ref_by_n
a
me() to accept con
s
t l
i
st
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
add basic http
c
lone/fetch
tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-26
Jeff King
test scripts
:
re
f
actor start_httpd helper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-25
Jef
f
King
never fa
l
lback
r
e
l
a
tive times to absolute
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff Ki
n
g
add basic branch d
i
splay tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-19
Jeff K
i
ng
branch: clean up rep
e
a
ted
str
l
en
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-14
Jeff King
symbol
i
c-re
f
: allow refs/<whatever>
i
n
HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-02-04
J
eff King
valgrind: ignore ldso and
more libz e
r
r
ors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-01-30
Jeff K
i
ng
t000
5
: use SIGTERM fo
r
sigcha
i
n test
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next