repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
2014-01-27
J
ohn Keeping
M
a
kefile: remov
e
r
e
du
n
dant o
b
ject in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn K
e
epin
g
pull: suppr
e
ss e
r
r
o
r when
n
o
r
emoteref is foun
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Joh
n
Keeping
completion: h
a
n
dle --[n
o
-]fork-p
o
int options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion: co
m
p
lete merge-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Ke
e
pi
n
g
rebase: f
i
x
fork-
p
oi
n
t with
ze
r
o
a
rguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John
K
e
e
ping
rebase: use
r
eflog to f
i
nd common
base w
i
th upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Jo
h
n Kee
p
ing
pull: us
e
mer
g
e
-base
--fork-point when
a
p
p
r
o
priate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-re
m
o
t
e: remove
d
eprecated alias of
l
s-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
ep
i
ng
lost-fou
n
d: rem
o
ve depr
e
cated
comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Kee
p
i
n
g
tar-tree:
r
emove
deprecated
c
o
mman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
r
epo-conf
i
g:
r
emove deprecated alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Docum
e
ntat
i
on/Makefile: make AsciiDoc
dblatex dir
c
o
n
figurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keepin
g
m
e
rg
e
-
r
ecu
r
sive: fi
x
parsing of
"diff-alg
o
rithm
"
opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset
:
h
andle submo
d
ule
w
ith
tra
i
ling
s
lash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Kee
p
ing
r
m
:
re
-
use
p
a
rse_pathspec
'
s
trailing-slash rem
o
val
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Joh
n
Keep
i
n
g
git_remote_h
e
l
p
e
rs: re
m
ov
e
l
it
t
le u
s
ed
Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1): logically group
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
rev-parse: remove
r
estricti
o
ns on some
o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
Jo
h
n
Kee
p
ing
pull: change the descripti
o
n to "integr
a
te" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
push
:
avoid
suggesting "mer
g
ing" remot
e
chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
gi
t
-confi
g
(1): clarify
p
r
e
cedence o
f
m
ulti
p
le va
l
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keepi
n
g
g
i
t-config: updat
e
doc for
-
-
g
et w
i
th multi
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keeping
complet
i
on: le
a
rn
ab
o
u
t
--man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keeping
completi
o
n: handle unstuck form of
ba
s
e git
opt
i
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keepi
n
g
fast-import: allow moving th
e
r
o
ot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
f
a
st-impo
r
t: allow
ls or filecop
y
o
f the root tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn K
e
ep
i
n
g
fast-import: set valid mode on root tr
e
e in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
t9300: d
o
c
ument fast-import empty path issu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
s
ubmodule: dr
o
p
t
he
top-
l
evel req
u
irement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
epi
n
g
rev-
p
arse: add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn K
e
e
p
i
ng
s
ubmodule: sho
w
fu
l
l path in e
r
r
or message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t
7
403: add missing && chainin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t7403: modernize st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
eeping
t7401: make
i
ndent
a
tion consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
mer
g
etoo
l
--li
b
:
refa
c
tor {diff,merge}_c
m
d logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
e
eping
D
o
cum
e
ntation/Make
f
i
le: move in
f
odir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
eeping
D
o
cume
n
tation/Makefile:
fix spaces around assi
g
n
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
d
d--interactive:
r
es
p
ect diff
.
algorith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui:
fix file na
m
e
h
a
ndling with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
h
n Kee
p
ing
fet
c
h:
d
on't try to upd
a
te u
n
fetched tracki
n
g refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keepin
g
difftool
:
fix dir-diff when file does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keep
i
ng
merg
e
-tree: handle directory/em
p
ty
conf
l
ict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/
Mak
e
file: don't define TEST_RESULTS_DIR
E
CT
O
RY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Kee
p
i
n
g
contrib/sub
t
r
e
e: don't dele
t
e
remote
b
r
anches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test o
u
tp
u
t: respect
$
TEST_OUTPUT_DIRECT
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: rem
o
ve smo
k
e test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
merge-tree
:
fix typo in "both
c
h
a
nged identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/
M
akefile: fix r
e
sult handlin
g
with TEST_OU
T
PUT_D
I
R
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
epin
g
transport-helper: add 's
i
gned-tag
s
' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
ansport-helper: pass --signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
f
ast-
e
xport: add --s
i
g
ned-tags=warn-s
t
ri
p
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
t/test
-
li
b
.
s
h
: f
i
x
TRASH_DIR
E
CTORY
handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-t
r
e
e
: do
n
't print entries that
match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
git
r
em
o
te-helpers(1):
c
larify r
e
f
spec behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
ee
p
i
n
g
sub
m
o
d
ul
e
: print graph output next to submodu
l
e lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
dif
f
:
allow un
s
tuck arguments with --di
f
f-
a
lgori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
git-m
e
rge(1)
:
document
diff
-
algorithm op
t
ion to
m
e
rge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid
si
g
ned in
t
eger ove
r
flow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Kee
p
in
g
d
iffcore-br
e
ak: don't di
v
id
e
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
run --d
i
r-diff te
s
ts wit
h
and wi
t
hout symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Kee
p
i
n
g
t7
8
00: fix te
s
ts
when difftool uses --no-symli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t780
0
: don
'
t
hide gr
e
p
ou
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don
'
t overwri
t
e modified fi
l
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Ke
e
ping
t7800
:
mov
e
'--symlinks' specific
t
est to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree: fi
x
typo i
n
merge-tree
.
c::u
n
r
e
sol
v
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
ref
s
.
c: fix fread
error hand
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix
f
ilter loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003:
m
oder
n
i
ze style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --dir-diff: symlink al
l
fil
e
s matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
if
f
tool:
a
void doub
l
e
s
lashes in s
y
m
li
n
k targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1
)
: fix formatti
n
g
of
--symlink
d
es
c
ription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Re
v
e
rt "
g
raph
.
c
: mark
private f
i
le-scope s
y
mbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
ping
Makefile: make ma
n
dir, htmldir and infodi
r
absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keep
i
ng
rebase -i: re
s
pect core
.
comm
e
n
tchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
combine-diff
.
c: t
e
ach combined diffs a
b
out
l
ine pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff
.
c: use diff_line_prefix() where ap
p
licable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Keeping
diff: add diff_li
n
e_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c:
m
ake const
a
n
t string arg
u
m
ent
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff:
w
rite p
r
ef
i
x
t
o the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
eping
gr
a
ph
:
output paddi
n
g for mer
g
e subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tes
t
s for
"diff --cc --raw <trees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Kee
p
i
n
g
bu
i
ltin/
a
pply
:
tigh
t
en
(
d
i
s)si
m
ilarity index parsin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
ergetool--l
i
b: li
s
t user configured tools in
'
--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Kee
p
ing
Rename {git- =>
g
it}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Jo
h
n Keep
i
n
g
Cod
i
ngGuidelines: add Pytho
n
coding guideli
n
es
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-testpy: fix path hashing on Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
mergetool--lib:
don't call "exit" in
s
etup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
gi
t
-
diffto
o
l
:
u
se git-
m
erge
t
o
o
l--lib for "--t
o
ol
-
hel
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
g
it-mergetool: don't hardcode '
m
ergetoo
l
' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
gi
t
-mergetool:
r
emove redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-mergetool:
move sho
w
_tool_hel
p
to mergetool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keeping
gi
t
-re
m
o
te-testpy: call print as
a
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-re
m
ote-testpy: don't do
un
b
uffered
t
ext I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remot
e
-
testpy: hash byte
s
explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
epi
n
g
svn-fe: allow s
v
n
r
dump_s
i
m
.
py to
ru
n
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git_remote_helpers: use 2to3 if
building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git_remot
e
_
helpers: force
r
e
build if pytho
n
vers
i
on
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
hn Keep
i
ng
git-cvsimport
.
t
xt: c
v
s
ps-2 is
d
e
precated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
ohn Keeping
gi
t
-for-each-
r
ef
.
txt: 'raw' is a suppo
r
ted da
t
e f
o
rmat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Kee
p
ing
gi
t
_
re
m
o
te_helper
s
: fix in
p
ut when
r
u
nni
n
g under Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next