repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add hint interactive cleaning
2014-05-27
John Keeping
completio
n
: add miss
i
ng options for gi
t
-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Joh
n
K
eeping
completion: add
a note that merge options are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
Joh
n
Keeping
b
ui
l
tin/mv: fix out of b
o
unds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
eping
bui
l
tin
/
mv: don't use m
e
mory afte
r
free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
ng
utf8: use c
o
rrec
t
type
f
or val
u
es i
n
interv
a
l table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn
K
e
e
pin
g
utf8: fix
iconv error detect
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
notes-utils: handle boolea
n
notes
.
rewritemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John K
e
e
ping
Make
f
ile: remove
r
edundant object in
git
-
http
{
fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John
K
eepi
n
g
pull:
s
uppress err
o
r wh
e
n no r
e
moteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keepin
g
completion: han
d
le --[no-]fork-point op
t
ions to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
compl
e
tion: complete merge-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
r
ebase: fi
x
f
o
rk-
p
oint with zero
a
rgumen
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebas
e
: use reflog to find common base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn Ke
e
pi
n
g
pull: use
mer
g
e-
b
ase --fork-poin
t
w
hen ap
p
ropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
peek-remote: remove depr
e
cated
a
li
a
s
o
f ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
epi
n
g
lost-fou
n
d
:
remo
v
e
depreca
t
ed
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Ke
e
ping
ta
r
-tree: re
m
ove
depre
c
a
t
ed
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keepin
g
repo-config
:
re
m
ove deprecated a
l
i
as for
"git co
n
fig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentation
/
Makefile: make Ascii
D
oc db
l
atex dir confi
g
ura
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
ohn Keeping
merge-recurs
i
ve:
f
ix par
s
i
ng o
f
"dif
f
-a
l
gorithm" o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
res
e
t: h
a
ndle submodule with trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepin
g
rm: re-use parse_
p
athspe
c
's t
r
ailing-slash re
m
ov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
K
eepin
g
g
i
t_remo
t
e_helpe
r
s: remove
lit
t
le
u
sed
Pytho
n
l
ibrary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
oh
n
K
e
e
p
ing
rev-parse(1): log
i
c
ally grou
p
opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
rev-parse: re
m
ove restrictions on so
m
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John
K
eeping
p
u
ll:
c
h
ange
the descript
i
o
n
to "integrate" ch
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
K
e
e
p
ing
push: avoid suggesting "merging"
remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepi
n
g
g
i
t
-
config
(
1)
:
clarify precedence of multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Joh
n
Keeping
git-config:
update doc for --get with multiple value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepin
g
completion: learn
about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: hand
l
e unstuck
f
o
r
m
o
f
base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
a
st-import: allo
w
moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fast-import
:
a
llow ls
or
f
ile
c
opy of the ro
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
fast-import:
set
v
alid
m
o
d
e o
n
ro
o
t
tr
e
e in
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keepi
n
g
t
9300:
document f
a
s
t
-
i
mport emp
t
y path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
submodul
e
:
drop t
h
e top-l
e
vel requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-
p
arse: add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
eeping
submo
d
ule: s
h
ow full path in
e
rror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
in
g
t7403:
add m
i
ssing &
&
chaini
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t74
0
3: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t74
0
1: make in
d
entation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
merg
e
t
o
ol--li
b
: refacto
r
{diff,merg
e
}_cmd logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
Doc
u
mentation/Makefile
:
m
o
ve infodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
Documen
t
ation/Make
f
ile: fix spac
e
s around as
s
ignment
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
dd--
i
nteractive: respect diff
.
al
g
or
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Jo
h
n K
e
ep
i
n
g
git-gui: fix file name
han
d
ling wi
t
h
n
o
n-emp
t
y prefi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Joh
n
Keep
i
ng
fetch:
do
n
'
t
try to update unf
e
tc
h
ed track
i
ng refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Ke
e
pin
g
d
ifftool: fi
x
dir-diff w
h
e
n fil
e
does
n
ot exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn K
e
eping
merge-tr
e
e: han
d
l
e
directory/empty conf
l
ict co
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
o
hn
K
eeping
t/Ma
k
efile: don't defi
n
e
T
EST_RESULTS_
D
IRE
C
TORY rec
u
rsi
v
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Jo
h
n
Keeping
con
t
rib/subtree: don't
delete remote branches if
sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Ke
e
p
ing
test output:
respect $TEST_OUTPUT_DI
R
ECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Mak
e
file: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keep
i
ng
merge-tree:
f
ix typo in "both
ch
a
nged identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John
Keeping
t
/Makef
i
le: fix r
e
su
l
t handl
i
ng with TEST_
O
UTPUT_DIRE
C
T
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
transport-helper: add 's
i
gned-tags' capab
i
lit
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tra
n
s
po
r
t-helper: pass -
-
signed-tags=warn-str
i
p to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn
K
eeping
fast-expo
r
t: add --signed-tags=wa
r
n-strip m
o
de
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
K
e
epi
n
g
t/test-lib
.
sh: fix
TR
A
SH_DIRECTORY handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepin
g
merge
-
t
r
ee: d
o
n't p
r
int entr
i
es th
a
t match
"
local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn K
e
eping
gi
t
remote-
h
e
l
p
ers(1): clarify refspe
c
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
submodule: print gra
p
h outpu
t
next to
submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn
K
eeping
diff: allow unstuck arguments wit
h
-
-
d
iff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John 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 Keeping
bisect: avoi
d
signed
i
nteger
o
ve
r
fl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Kee
p
ing
d
i
ffcore-break:
don't
d
ivide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t78
0
0:
run --dir-diff te
s
ts with and without
symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn K
e
eping
t78
0
0: fix tests when difftool uses --n
o
-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t78
0
0
:
d
o
n't
h
ide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
diff
t
ool
:
don't overwrite m
o
difi
e
d
file
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
n
g
t7800: move '--symlinks
'
s
p
e
cific
t
est to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree: fix typo in merge-tree
.
c
:
:unr
e
solved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
e
p
i
n
g
r
e
fs
.
c:
fi
x
fr
e
ad error handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
entry: fix fil
t
er
l
ookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
pi
n
g
t2003:
mo
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
d
ifftool
-
-dir-diff: symlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
K
eeping
difftool:
a
void
d
ouble
s
l
as
h
es in symlink targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
git-difftool(1): fix formatting of --syml
i
nk de
s
cription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c: mark pr
i
va
t
e
file-sc
o
pe symbo
l
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile:
make
m
an
d
ir, h
t
mld
i
r and i
n
fodir ab
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
rebase -i: respect core
.
commentch
a
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keep
i
ng
combine-diff
.
c: teach com
b
i
n
e
d di
f
fs ab
o
ut line
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
diff
.
c:
u
se diff_li
n
e
_prefix()
w
h
ere applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
di
f
f: add diff_li
n
e_p
r
efix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make
c
o
n
st
a
nt string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Kee
p
i
ng
diff: write prefix to the correct fil
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Kee
p
ing
grap
h
: out
p
ut
paddin
g
f
o
r merge subsequent par
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
Kee
p
ing
t4038: add tests for "diff --cc --raw
<
trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
buil
t
in/app
l
y
:
tighten (
d
is)similarity inde
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
e
epin
g
mergetoo
l
--lib
:
list
u
ser conf
i
gured
t
ools
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Kee
p
ing
R
ename {g
i
t- => git}r
e
mote-
h
elpe
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Keepi
n
g
Codi
n
g
Guidelines: ad
d
Python coding
g
uidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-testpy: fix path hash
i
ng on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
i
ng
mergetool-
-
lib: d
o
n't c
a
ll
"exit"
i
n setup
_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git
-
dif
f
to
o
l: use git
-
mergetool
-
-lib for
"--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
ng
git-merget
o
ol: don't hardc
o
de
'mergetool' in show_tool_he
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-mergetool:
r
em
o
ve redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-mergetool: move show_
t
ool
_
help
to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-
r
emote-testpy: c
a
l
l print as a funct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-remo
t
e
-testpy:
d
on't do unbuf
f
e
red text I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next