repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
verify-pack: use strbuf_strip_suffix
2014-05-27
J
ohn Keep
i
ng
com
p
let
i
on: add missing options for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
o
hn Kee
p
ing
comp
l
etion:
add a note th
a
t
m
erge opt
i
on
s
are sh
a
red
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
Joh
n
Kee
p
ing
b
u
iltin/mv
:
fix out of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
K
eeping
bu
i
ltin/
m
v:
don'
t
use
me
m
or
y
aft
e
r
free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: use correct type for va
l
u
e
s
i
n
interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf
8
:
f
ix iconv er
r
or
detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
oh
n
Keeping
n
otes-uti
l
s: han
d
le
b
o
olean note
s
.
rewri
t
emode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keep
i
n
g
Makefile:
r
emove red
u
ndant object in
g
it-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
o
hn Keepin
g
pull:
s
uppress erro
r
w
h
en
no re
m
oter
e
f is
found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Ke
e
ping
c
ompletion: handle --[no-]fork-point options to
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion: c
o
mplete merge-bas
e
optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
r
e
base: fix fork-poin
t
w
i
th zero argu
m
ent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keepin
g
rebase: u
s
e re
f
log to f
i
n
d comm
o
n
b
ase wit
h
upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Jo
h
n Keepi
n
g
pull: use merg
e
-base --fork-point wh
e
n appr
o
priat
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
peek-remote: rem
o
ve
deprecated alias of ls-remot
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
lost-
f
o
u
n
d
: remove depreca
t
ed command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepin
g
tar-tree
:
remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
re
p
o-config: r
e
m
o
ve
de
p
reca
t
ed a
l
ias for "git c
o
nfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Do
c
umentation/Makefil
e
:
make
A
sc
i
iDoc dblatex
di
r
configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keepin
g
merge-recursive: fix
pa
r
sin
g
o
f
"diff
-
algori
t
hm"
optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
eeping
rese
t
: h
a
ndle submod
u
le with traili
n
g slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Ke
e
ping
rm: r
e
-use parse
_
path
s
pec's trailing-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
g
it_re
m
ote_hel
p
ers: remove litt
l
e used
P
y
t
h
o
n
l
i
br
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev-p
a
rs
e
(1): logical
l
y group
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keepi
n
g
rev-parse:
remove re
s
trictions on some
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
ohn K
e
eping
pull: chan
g
e the description to "
i
n
t
egrat
e
"
c
ha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
p
u
sh:
avoid sugge
s
t
i
ng "mergin
g
" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
g
i
t
-co
n
fig(
1
):
c
larify precedence of
mu
l
tiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
ohn Keeping
g
it-config: update
d
oc fo
r
--get with mul
t
ip
l
e v
a
l
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
completion: learn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
comple
t
ion: handle u
n
stuc
k
form of base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast-import: a
l
low
movin
g
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
ast-
i
mport: al
l
ow ls or filecopy of the
r
o
ot
tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-i
m
p
o
r
t: set vali
d
mode on ro
o
t tree
in
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: docum
e
nt fast
-
import
empty path issue
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
submodule: drop the top-level requirem
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keep
i
n
g
rev-parse
:
add --pref
i
x o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
K
eeping
sub
m
o
dule: show
full p
a
th in error me
s
sage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
403: add mis
s
ing && cha
i
n
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n K
e
epin
g
t740
3
:
m
od
e
rnize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t7401: make indentation
co
n
sistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Ke
e
ping
mergetool--lib: ref
a
c
t
or {di
f
f,merge}_cmd lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Doc
u
menta
t
ion/Make
f
ile:
move info
d
ir to be
w
i
t
h other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
i
n
g
Doc
u
m
e
nta
t
ion/M
a
k
e
f
il
e
:
f
ix spa
c
es around ass
i
gnme
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Keeping
add-
-
i
n
teractive: resp
e
c
t di
f
f
.
alg
o
r
it
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Ke
e
ping
git-gui: fi
x
fil
e
n
ame
handling
w
ith non-em
p
t
y
pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John
K
e
epi
n
g
fetch: don't try to up
d
ate unfetched
tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
eeping
difftool: fix dir-
d
iff when file
d
o
es not exi
s
t in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John K
e
eping
merge-tree: handle directory/empt
y
conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John K
e
eping
t/Makefile: don
'
t defi
n
e T
E
ST_RESU
L
TS
_
D
I
RECTOR
Y
r
ecursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Joh
n
Kee
p
ing
c
on
t
rib/su
b
tree: don't delete r
e
mote branche
s
if sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Ke
e
ping
test
output: resp
e
ct $TEST_OUTPUT_D
I
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile:
remove s
m
oke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
e
p
ing
merg
e
-tree: f
i
x
t
ypo in "b
o
th cha
n
ged identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John
Keeping
t
/
Makefile: fix result handling with
T
ES
T
_OUTPUT
_
DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
t
r
a
nsport-helpe
r
: add 's
i
gne
d
-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transpo
r
t
-
helper: pass --si
g
ned-tags=warn-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
f
a
s
t
-ex
p
ort: add --signed-tag
s
=warn
-
strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
t/tes
t
-lib
.
sh:
f
ix TRA
S
H_
D
IRECTORY handl
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Joh
n
Keeping
merge-tree: don't print
e
ntries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gi
t
remote-helpers(1
)
:
c
lari
f
y refspec
behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n K
e
epi
n
g
submodule: print graph o
u
tput next to s
u
b
mod
u
le log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
d
iff: allow
unstuck arguments with --diff-algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
git-merge(1
)
: document diff
-
algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
n
g
bis
e
ct: avoid signed integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn
Keeping
diffcore-break: don't
d
ivide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
: run -
-
di
r
-diff tests with and
w
ithout s
y
ml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn
K
e
epi
n
g
t7800: fix tests when diff
t
ool uses --no-sy
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800:
don't
hid
e
grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n Keeping
difftool: don't ove
r
write mod
i
fied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
move
'-
-
s
y
mlinks' spe
c
ific
t
est to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keepin
g
merge-tre
e
: fix
ty
p
o i
n
me
r
ge-tre
e
.
c::un
r
e
solved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
oh
n
Keepin
g
refs
.
c
:
f
ix fre
a
d error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry:
fix
filter look
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
t2003
:
mode
r
nize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
difftool
-
-
dir-
d
iff: sy
m
li
n
k
al
l
files
ma
t
chin
g
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
di
f
ftool: avoid doub
l
e
slashes
in symlink targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1):
f
i
x formatt
i
ng of
--symlink
d
escri
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert
"
graph
.
c:
mark privat
e
fi
l
e-sc
o
pe symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Keeping
M
a
k
e
file: make ma
n
di
r
, htmldir and infodi
r
absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase
-i: re
s
pect co
r
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
ep
i
n
g
combine-diff
.
c: teach
c
ombined diffs about l
i
ne pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keepin
g
d
iff
.
c: use diff_line_prefix() where applic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
di
f
f: a
d
d d
i
ff_line_pre
f
ix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
d
i
f
f
.
c: make constant
string
a
r
guments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff: wr
i
te
prefix
t
o
the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keeping
gr
a
ph: out
p
ut padding f
o
r merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: a
d
d tests for "diff --cc --raw <trees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/ap
p
l
y:
tight
e
n
(
dis)simil
a
rity i
n
de
x
parsin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
h
n
Keepi
n
g
mergetool
-
-lib: list use
r
confi
g
ur
e
d
t
ools
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn
Keepi
n
g
Rename {git- => git}remote-help
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
oh
n
Ke
e
ping
Cod
i
ngGuidelines: add Python coding guide
l
ines
commit
|
commitdiff
|
tree
2013-01-28
John
K
e
e
p
i
n
g
git-r
e
mote-
t
estpy: fix pat
h
hashing on Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
h
n Ke
e
ping
mergetool--lib: don't call "exit"
i
n setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
ping
git-difft
o
ol: use git-mergetool
-
-l
i
b for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-mergetoo
l
:
d
on'
t
hardcode 'mergetool
'
in
s
how_to
o
l_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-
m
erget
o
ol:
remove red
u
ndant ass
i
g
nment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-m
e
rget
o
ol: move
show
_
tool_help
t
o mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remot
e
-tes
t
py: ca
l
l
p
ri
n
t as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
r
e
mote-testpy: don't
d
o unbuffered text I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next