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
Show a failure of rebase -p if the merge had a conflict
2008-03-13
J
eff K
i
n
g
t750
5
:
u
se SHEL
L
_PAT
H
in h
o
ok
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff K
i
ng
t
9112:
add
m
is
s
ing #!/bin/sh h
e
ader
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jef
f
King
filter-branch: use
$
SHELL_PATH in
s
tead o
f
'sh'
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
filter-bran
c
h
:
don'
t
use x
a
rg
s
-0
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
add NO_EXTER
N
A
L
_GR
E
P build option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t6
0
00lib: tr portabilit
y
f
i
x
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jef
f
King
t4020: d
o
n't use gr
e
p
-a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
J
e
ff King
add test_cmp function for test s
c
r
i
pts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
remo
v
e use of "tail -n 1" and
"
t
ail
-
1"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
g
r
ep portability fix: don't use "-e
"
or "-q"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
K
ing
more
t
r portabili
t
y
test script fi
x
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t
0050: perl porta
b
ility f
i
x
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
tr portability fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-12
Jeff K
i
ng
t0021: tr portability
fix for Solaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-10
Jeff King
[PATCH] gitk
:
make autoselect
o
ptional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-09
J
e
ff
King
A
dd a
test for r
e
ad-tree -
u
--r
e
s
e
t
w
ith a D/F conflic
t
commit
|
commitdiff
|
tree
2008-03-03
Jeff King
r
e
vert: actuall
y
check for a dirty index
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-01
Jeff
K
i
ng
allow git-am
to run in a subdirector
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-03-01
Jeff King
rename: warn use
r
when w
e
have turned off rename detection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-29
Jeff King
use build-ti
m
e
S
HELL_PATH in test
s
c
r
i
p
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff
King
help: resp
e
ct
a
l
iases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff King
m
a
ke alia
s
l
o
o
kup a public,
procedural function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff King
help: use
p
arseopt
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff King
send-email: tes
t
compo
s
e
funct
i
onal
i
ty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-25
Jeff Ki
n
g
t9001: enhance fake sendma
i
l
test harness
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-22
J
e
ff King
hash: fix lookup_
h
a
s
h semantics
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
J
eff Kin
g
di
f
f: f
i
x
java funcname pattern for solaris
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jef
f
Kin
g
t3404: use configured shel
l
instead of
/
bin/
s
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-21
Jeff
K
ing
git_config_*
:
don't ass
u
me we are parsin
g
a
config
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff King
p
ush: document the status ou
t
pu
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff King
Docum
e
ntation/pu
s
h: clarify matching re
f
spec behavior
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-20
Jeff
Ki
n
g
push:
indicat
e
p
a
rtial
n
ess of e
r
ror me
s
sage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-16
Jeff King
add--
i
nte
r
active: handle initial commit be
t
ter
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-16
Jef
f
King
commit:
d
iscard
ind
e
x
aft
e
r setting up partial commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-13
Jeff K
i
ng
status: suggest "git rm --cached"
to unstage for ini
t
ial
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-13
Jeff K
i
ng
har
d
-code the empty tree object
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-06
Jeff King
fix config r
e
ading in tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-02-06
J
e
ff King
allow
suppressin
g
of g
l
obal an
d
system conf
i
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-28
Jeff Kin
g
t900
1
:
a
d
d mis
s
ing && operators
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff King
send-e
m
ail
:
add no-validate opti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Jeff Ki
n
g
send-ema
i
l:
validate patches b
e
fore sending anyth
i
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Je
f
f King
send-email: d
e
tect invocation errors ear
l
i
er
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-18
Je
f
f King
co
l
or unc
h
anged lines as
"
plain" in "diff --color-words"
commit
|
commitdiff
|
tree
2008-01-12
Jef
f
King
git-clean:
f
i
x off-by-one me
m
or
y
acce
s
s when
g
iven
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jeff Kin
g
Document
the col
o
r
.
interacti
v
e se
m
antics
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jef
f
K
ing
add--intera
c
ti
v
e:
allow
d
iff co
l
ors without in
t
erac
t
ive
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-07
Jeff King
add--intera
c
tive:
r
emove unused diff c
o
lors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
J
e
ff King
diff: re
m
ove lazy con
f
ig loadi
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
Jeff King
diff: loa
d
funcname
p
a
tter
n
s in "basic"
config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-05
Je
f
f King
add a
"
basic" diff conf
i
g callba
c
k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-02
Jeff K
i
ng
git-reset: refuse
t
o
do har
d
r
eset in a bare repository
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2008-01-02
Jeff
King
conf
i
g: h
a
n
d
le lack of
n
ewline at end
o
f fil
e
better
commit
|
commitdiff
|
tree
2007-12-24
Jeff King
cvsimpo
r
t: die
o
n cvsps errors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-21
Jeff King
clean up 1
.
5
.
4 releas
e
n
o
te
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-19
Jeff King
test "git clone -
o
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-17
Jef
f
K
i
ng
git
-
send-email: av
o
id duplicate mess
a
ge-i
d
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-17
Jeff King
clone: correctly report http_fetch e
r
ror
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-16
Jeff King
rename
g
i
t
-bro
w
se--help
t
o git-h
e
l
p
--brows
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-16
Jef
f
King
teach bash com
p
letion
to treat command
s
with "-
-
"
a
s
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-16
Jeff King
trim_common_tail: brown paper
bag fix
.
commit
|
commitdiff
|
tree
2007-12-14
Jeff King
cvsexp
o
r
t
c
o
mmit: fix massive com
m
its
commit
|
commitdiff
|
tree
2007-12-11
Jeff King
git-clone: print an er
r
or message w
h
en trying to clone
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-11
J
e
ff King
shortl
o
g: document
-
e op
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-11
Je
f
f King
git-sv
n
: get color config f
r
o
m
--ge
t
-
col
o
rb
o
ol
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-11
J
e
f
f King
Support GI
T
_PAGE
R
_IN
_
USE environment v
a
riabl
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-10
Jeff King
Add git-br
o
wse-
h
elp t
o
.
gitignore
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-09
Jeff King
don
'
t mention index refreshing side effect
in
g
it-status
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-08
Jeff Ki
n
g
g
i
t
-status: documen
t
ation improvements
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-08
J
e
ff King
add status
.
relativePaths
config variable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-08
Jeff K
i
n
g
wt-st
a
t
u
s
.
c:quote_path(): conv
e
rt em
p
ty path
to "
.
/"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-06
Jef
f
King
t7300: a
d
d test f
o
r clean with wildcard
p
athspec
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-04
Jeff King
t9600: require cvsps 2
.
1 to p
e
rform tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-03
Jeff King
quo
t
e_path: fix c
o
lla
p
s
in
g
of rela
t
ive paths
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-03
Jef
f
King
Enab
l
e rewrite as well as rename dete
c
tion in git-status
commit
|
commitdiff
|
tree
2007-12-02
Jeff King
t
9600: test cvsimpor
t
f
rom CV
S
working t
r
ee
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-12-02
Jeff
King
g
i
t-commit: clean
u
p die messages
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-30
Jeff Kin
g
c
v
si
m
p
o
rt: f
i
x usage of cvsi
m
port
.
module
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-28
Jef
f
King
Revert
"
t551
6
: test u
p
da
t
e of local r
e
fs
o
n push
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-28
Jeff Ki
n
g
c
vsimpor
t
: mi
s
cella
n
eous pack
e
d-ref f
i
xes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-28
Jef
f
King
cvsi
m
po
r
t: use rev-par
s
e
t
o support packed r
e
fs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-28
J
e
f
f
King
A
dd basic cv
s
i
m
po
r
t tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-26
Jeff King
git-tag:
test t
h
at
-s implies a
n
an
n
o
tate
d
tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-21
Jeff King
send-
p
ack: cluster ref status repor
t
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-21
Jeff King
avo
i
d "d
e
fine
d
but not used" wa
r
n
i
n
g for fetch_objs_via_walker
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-21
Jeff
Kin
g
s
e
nd-email: add tran
s
fer e
n
coding header with c
o
ntent
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-18
Jeff King
se
n
d-pack: f
i
x
"
everything up-to
-
date"
m
essage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-18
Jeff King
send-pack:
t
i
ghte
n
remot
e
erro
r
reporti
n
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-18
Jef
f
K
i
ng
make "find_ref_by_name" a public fun
c
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-17
Jeff King
send-pac
k
: assign remote er
r
ors to ea
c
h ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-17
Jeff King
send-p
a
ck: ch
e
ck
r
ef->s
t
a
t
us be
f
o
r
e updating tra
c
king
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-17
Jeff
King
s
end-pack:
t
rack errors for each ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-17
Jeff King
g
it
-
send-email: add
c
harse
t
h
e
ader
if we add encoded
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-16
Jeff King
g
it-ls-f
i
l
es:
add --exclude-stan
d
a
r
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-12
Jeff Kin
g
git-
b
ra
n
ch: remove mention
of n
o
n-e
x
istent '-b
'
o
pt
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-05
Jeff Ki
n
g
send-pack: requir
e
--verbose to show update
of tracking
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-05
J
e
ff King
receive-pack
:
don't mention su
c
cess
f
u
l
u
p
dat
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-11-05
Jeff King
more
terse push
o
utput
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-10-20
J
e
f
f King
send-pack: respect '+' on
wildc
a
rd refspecs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-10-19
J
e
ff Kin
g
Documentation/git-g
c
: improve descript
i
on of --a
u
to
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-10-19
Je
f
f
K
ing
Do
c
umentation/git-gc: expla
i
n --au
t
o in description
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next