repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
2014-07-15
Jo
h
n Ke
e
ping
rebase--a
m
: use --cherry-pick instea
d
of --ignore
-
if
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
comp
l
e
tion: add
m
issi
n
g o
p
t
ions for git-merge
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-05-27
Joh
n
Keeping
com
p
letion:
a
dd a note t
h
at
m
erge options are shared
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin/mv: fix
out of bounds writ
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
builtin/mv: don't use memory af
t
er free
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Ke
e
p
ing
utf8: use correct type for values in in
t
erval table
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn K
e
e
p
in
g
utf8: fix iconv error det
e
ction
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
notes-ut
i
ls:
handle
boolean notes
.
rewritemode correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: remove redundant object
i
n git
-
http{fe
t
c
h
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-17
Joh
n
Keeping
pull: suppress error when no remoteref
i
s found
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n Keep
i
n
g
complet
i
on: handle --[no
-
]fork-point optio
n
s
to git
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion:
c
o
mplete merge-base opti
o
ns
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-09
J
o
h
n Keeping
re
b
a
s
e: fix fo
r
k
-po
i
nt wi
t
h zero
a
rgument
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
John Keep
i
ng
reba
s
e: use
r
ef
l
og to
f
ind common base w
i
th upstream
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John Keepin
g
pull: use me
r
ge-
b
a
s
e --fork-point when app
r
o
p
ria
t
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keeping
peek-remote: remo
v
e
deprecated alias of ls-rem
o
te
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keeping
lost-found: remove
d
eprecated command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-t
r
ee:
remove deprecated command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
r
e
p
o-conf
i
g: remove deprecated ali
a
s for "git config"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Do
c
ument
a
tion/Makefi
l
e: m
a
ke
A
sciiDoc db
l
atex
d
i
r
c
onfigurable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
mer
g
e-recursive: fix p
a
rsing of
"
diff-algorithm" optio
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John Kee
p
i
n
g
re
s
et: h
a
ndl
e
su
b
m
odul
e
w
ith
traili
n
g s
l
a
sh
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use
p
arse_pat
h
spec's trail
i
ng-sl
a
sh removal
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n
Keeping
git_
r
emot
e
_helpers: remove lit
t
le used Pyth
o
n library
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Keepi
n
g
r
e
v
-parse(1): logically
g
r
oup
op
t
i
ons
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
re
v
-par
s
e: remo
v
e r
e
s
tricti
o
n
s o
n
some options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull:
c
hange th
e
descri
p
tion to "inte
g
ra
t
e" changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid suggesting "m
e
r
g
in
g
" rem
o
te changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn
K
e
e
ping
git-config(1): clarify precedence of
m
ultiple
valu
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-config: update doc for -
-
g
et with multiple values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
e
p
i
n
g
c
omple
t
ion: learn
about --man-path
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
ompleti
o
n: handl
e
unstuck form of ba
s
e
git options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast-im
p
ort: allow moving the root
tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
f
a
s
t
-
i
mport
:
allow ls or filecopy of the root tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
fast-
i
mpor
t
:
set valid mode on root t
r
e
e
in "ls"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
t930
0
: document
f
ast-imp
o
rt empty path issues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
submodule: drop th
e
top-level requirement
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
rev-
p
arse: add
-
-prefix option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
submodule: show full path in er
r
or message
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t
7403: add missin
g
&& chaining
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
i
n
g
t7403: modernize sty
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
t74
0
1: ma
k
e
indentation
consistent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keepin
g
merge
t
ool
-
-lib: re
f
a
cto
r
{diff,
m
erge}_cmd logic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Document
a
tion/Makefi
l
e:
move info
d
i
r
to b
e
with oth
e
r
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keepin
g
D
o
c
u
mentation/Makefile: fix spac
e
s a
r
ou
n
d assignments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John Keepin
g
add-
-
interac
t
ive
:
re
s
pect diff
.
alg
o
rit
h
m
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gu
i
:
fix
file name
h
andling with non-emp
t
y pr
e
fix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
J
o
hn
Keeping
fetch:
don't
t
ry
t
o
u
pda
t
e unfe
t
c
hed tracking r
e
fs
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difft
o
ol: fix dir-diff
w
h
e
n file does not exist
in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keeping
merge
-
tre
e
: handle directory/empty co
n
f
l
ict corre
c
t
ly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
Joh
n
K
eeping
t/
M
a
kefi
l
e
:
don't d
e
fine TEST_RESULTS_DIREC
T
OR
Y
recursive
l
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
John K
e
eping
c
o
ntrib/sub
t
ree: don't delete r
e
mote bran
c
hes if
s
plit
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output
:
respe
c
t $TEST_
O
UTPUT_
D
IRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
t/Make
f
ile: remove smoke test targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John
K
ee
p
i
n
g
merge-t
r
ee: fix typo in
"
b
oth cha
n
ge
d
ident
i
cally"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fix resul
t
handl
i
ng with TEST_OU
T
PUT_DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport
-
helper
:
add 's
i
gned-tag
s
' capabi
l
ity
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport
-
h
e
lper: pass --sig
n
ed-tags=w
a
r
n-strip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fas
t
-
e
xport: add --signed-tags=
w
ar
n
-
s
t
rip mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/te
s
t
-lib
.
sh: fi
x
T
R
ASH_DIRECTORY han
d
l
ing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eepin
g
merge-tree: d
o
n
't p
r
int entr
i
es
t
hat m
a
tch
"local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John K
e
e
ping
gi
t
remo
t
e
-helpers(1): clarify refspec behav
i
our
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
n
g
s
u
bmodule:
p
r
int
graph output next to su
b
module l
o
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
d
if
f
: allow unstuck argu
m
ents with --d
i
ff-algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t
-
m
erge(1
)
: document diff
-
algorit
h
m
option to
merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n
Keep
i
ng
bisect: avoid signe
d
integer overflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n
Keepi
n
g
diffcore-break: don'
t
divide by zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-d
i
ff
tests w
i
th and wi
t
hout syml
i
nks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tests w
h
en diff
t
o
o
l uses --no-symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Kee
p
i
ng
t
7
800:
d
on't hi
d
e
grep
ou
t
put
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
difftool: don'
t
overwr
i
te mod
i
fied
f
iles
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t
7
800: move
'
--symlinks' specific t
e
st to the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John
Ke
e
ping
merge-tree:
fix typo in merge-tr
e
e
.
c::unresolv
e
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
J
ohn K
e
e
p
ing
refs
.
c:
f
ix fread 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 Keeping
t2003: modernize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Keepi
n
g
d
if
f
tool --dir-dif
f
: symlink all files
matching the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diff
t
ool
:
avoid double
s
l
a
shes in symli
n
k ta
r
gets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn K
e
eping
git-difftoo
l
(1): fix formatting of -
-
syml
i
n
k descrip
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c: mar
k
private file-scope symbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keeping
Makefile: make mandir, htmld
i
r and infodir
absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
re
b
a
s
e
-i: respe
c
t core
.
commentch
a
r
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Keeping
c
o
mbine-di
f
f
.
c
:
teach combi
n
e
d
diffs about line
pre
f
ix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff
.
c: use
d
iff_line_prefix()
w
here app
l
i
c
able
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
diff: add diff_line_prefix function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keep
i
ng
diff
.
c
: make cons
t
ant string arguments const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
di
f
f: write prefix to the
corr
e
c
t
f
i
le
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn
K
ee
p
i
ng
graph: output p
a
ddi
n
g for merge subsequ
e
nt p
a
rents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038
:
add tests for "di
f
f --
c
c --raw <
t
ree
s
>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
bu
i
ltin/apply: tig
h
t
en (
d
is
)
sim
i
larity in
d
ex p
a
rsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool
-
-l
i
b:
lis
t
us
e
r configured
t
ools
i
n
'
--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
Jo
h
n 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
o
hn Kee
p
i
ng
CodingGuidelines: add Py
t
hon cod
i
ng g
u
idelines
commit
|
commitdiff
|
tree
2013-01-28
J
o
h
n Keeping
git-remote-
t
estpy: fi
x
pa
t
h
hashin
g
o
n Python
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
m
e
rgetoo
l
--lib: don't call "exit
"
in setup_tool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Ke
e
p
ing
g
i
t-diffto
o
l: use
git-mergeto
o
l--li
b
for "--tool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn K
e
epi
n
g
gi
t
-mergetool: don'
t
hardcode 'mergetool' in show
_
tool_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
ping
git-m
e
rge
t
o
o
l:
r
emove
r
e
dundant
ass
i
gnment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-
m
ergeto
o
l: move show_tool
_
help to
m
e
rgetool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-remote
-
test
p
y
:
call
p
r
in
t
as a function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next