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
Merge branch 'bc/archive-pax-header-mode'
2014-07-22
J
o
hn K
e
eping
completion: comp
l
ete
`git push --fo
r
c
e-with-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: add so
m
e
m
issing
o
pti
o
ns
to `g
i
t pus
h
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
K
eeping
completion: complete "unstuck" `git push --recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keep
i
ng
rebase: omit pat
c
h-i
d
en
t
i
cal com
m
its
w
ith -
-
fork-po
i
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keep
i
ng
rebase--a
m
: use --cherry
-
pick instead o
f
-
-
ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Kee
p
ing
completion: add missing options for g
i
t-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Ke
e
ping
c
o
mpletion:
a
d
d a note
that merge o
p
tions ar
e
shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
o
h
n
K
e
e
pi
n
g
b
ui
l
tin/mv: fix out of
bounds wri
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
builtin/
m
v: don'
t
u
se memory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
Keepin
g
utf8: u
s
e corr
e
ct type for va
l
ues in interv
a
l table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: fix ic
o
nv error dete
c
t
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eepi
n
g
not
e
s-utils:
handle bo
o
lean
n
otes
.
rewritemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Joh
n
Keeping
M
a
kefile: remove
r
edu
n
dant object in git-htt
p
{
f
etch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John
Keeping
pu
l
l: suppress error
when
no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keeping
c
ompletion: ha
n
dle --[no-]fork-p
o
int optio
n
s to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Ke
e
pin
g
c
ompletion
:
complete
m
erge-base
o
pt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John
K
e
eping
rebase
:
fix
f
ork-po
i
nt wit
h
zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
reba
s
e
: use reflog to find co
m
mon base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Jo
h
n Keeping
pull:
u
se merge
-
ba
s
e --fork-p
o
int when appr
o
pria
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keep
i
ng
peek
-
remo
t
e: remove deprec
a
ted alia
s
of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
l
ost-found:
r
emove depr
e
ca
t
ed
com
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n
Keeping
tar-t
r
ee: r
e
m
ove deprec
a
t
e
d c
o
mm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
r
e
po
-
conf
i
g: rem
o
ve deprecate
d
al
i
as
f
or "git c
o
nfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keepi
n
g
D
o
c
u
mentation/Makefile: mak
e
A
s
c
i
iDoc d
b
latex
d
ir config
u
rabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Jo
h
n Keepi
n
g
me
r
g
e-recursive: fix parsing
o
f
"diff-al
g
orithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: han
d
le submodu
l
e with trailin
g
sl
a
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: r
e
-
u
se parse_pa
t
hspec's trailing-sla
s
h removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n Keeping
git_remo
t
e_h
e
l
pers: remove litt
l
e used Pyth
o
n
l
ibrary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
in
g
rev-p
a
r
se(1): logically group opti
o
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Keeping
r
ev-pars
e
:
remove restrictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pu
l
l:
chang
e
the
description to "integ
r
a
t
e"
chang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push:
avoid sugg
e
sting "merging" remote
c
hanges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Keeping
g
i
t-config
(
1)
:
c
larify precedence of multipl
e
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
o
hn Kee
p
ing
git-config:
u
pdate doc for -
-
get with multiple va
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keeping
c
o
mpletion: learn about --man-p
a
t
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Ke
e
ping
completion: handle
u
nstuck form of base git o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-impo
r
t: allo
w
m
o
v
ing
the roo
t
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
ast-import: allow ls or filecopy of the
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
fast-i
m
port: set
valid mo
d
e
o
n
r
o
o
t tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t93
0
0: document fas
t
-impor
t
e
m
p
t
y
path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keep
i
n
g
s
u
bmodule: drop
the t
o
p-level requi
r
ement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
r
ev
-
parse: add
-
-pre
f
ix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
sub
m
od
u
le: show full path in err
o
r message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t7403: add missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t7
4
03: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make
i
nde
n
tatio
n
co
n
s
i
s
t
e
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetoo
l
--l
i
b: refac
t
or {diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
K
eeping
Documen
t
ation/Makefile: move infodi
r
to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docum
e
n
t
ation/Makefile: f
i
x spaces around assignme
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keep
i
ng
a
d
d--
i
nteractive:
r
espec
t
diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John
Ke
e
pin
g
git-gui: fix file name h
a
n
dlin
g
with non-emp
t
y p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't try to u
p
date
u
n
f
e
tc
h
ed tracking
re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
ep
i
ng
diffto
o
l: fix dir-diff when
f
i
l
e doe
s
not ex
i
st i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
hn Kee
p
i
n
g
me
r
ge-tree:
h
andle directory/empty conflict
c
orrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Kee
p
i
n
g
t/Makefil
e
: don't define TEST
_
R
E
S
U
LTS_DIR
E
CTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
Keeping
contrib/subtree: don't delete remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n Keeping
test output:
r
espect $TEST_OUTPU
T
_DI
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keeping
t
/
Makefi
l
e:
r
emove smoke te
s
t
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keepi
n
g
m
erg
e
-t
r
ee: fix typo
i
n "bot
h
changed identical
l
y"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t
/Ma
k
ef
i
le:
f
ix re
s
ult han
d
ling wi
t
h
TEST_O
U
TPUT
_
DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-he
l
pe
r
: add 'signed-tags
'
capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
in
g
tra
n
s
p
ort-hel
p
er: pass --signed-tags=
w
arn
-
st
r
ip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
fast-export: add --s
i
g
ned
-
tags
=
warn-strip
m
o
de
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/test-lib
.
sh: fix TRASH_DIRECTORY h
a
ndl
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
m
erge-tre
e
: do
n
't p
r
int entries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn Keeping
gitremote-hel
p
ers(1):
clarify refspec be
h
av
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print graph output next to subm
o
dule
l
o
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
h
n Keeping
diff:
allow unstuck a
r
gume
n
ts with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
git
-
m
e
rge(
1
): document di
f
f-
a
lg
o
rith
m
o
p
tion t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keep
i
ng
bi
s
ec
t
: avoid
signe
d
integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n
Kee
p
ing
di
f
fcore
-
break: don't divide by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: run --dir-diff
t
e
s
ts wi
t
h
and
w
ithout
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800: fix tests
w
hen di
f
f
tool uses --no-sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Kee
p
i
n
g
t7800: don
'
t
h
i
de grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
eping
diff
t
ool: don't o
v
erwrite
modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: move
'
--
s
y
m
links' specifi
c
test to
t
he
e
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Ke
e
ping
m
erge-tree: fi
x
typ
o
in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
eping
refs
.
c: fix fread e
r
ror
handli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
e
ntry: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
t2003
:
m
o
der
n
ize
s
tyl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
dif
f
tool --dir-diff: s
y
mlink all fil
e
s matching
t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Kee
p
i
n
g
difftool
:
avoid
double slashes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
git-dif
f
tool(1): f
i
x formatting of --symlink
d
e
sc
r
iption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
Keeping
R
evert "graph
.
c:
m
ark privat
e
f
ile-scope symbols
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makef
i
le:
make mandir,
htmldir
a
n
d
infodi
r
absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
e
eping
r
e
base -i
:
respect core
.
co
m
men
t
c
ha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
comb
i
ne-diff
.
c: teach
c
o
mbi
n
ed diffs
a
bou
t
line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
.
c: use diff_line_prefix() where appli
c
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff:
a
dd diff_line_prefix f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
d
iff
.
c:
m
ake c
o
nstant string argume
n
ts const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
dif
f
: write p
r
e
f
ix to
t
he c
o
rrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
eping
gra
p
h: output padding for
m
e
r
g
e subsequent par
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4
0
38: add test
s
for "diff
-
-
cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
b
u
i
l
tin/apply: ti
g
hten (dis)similarit
y
index par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merget
o
ol--lib: li
s
t user
configur
e
d tools in
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Jo
h
n Keepin
g
Rename {git- => gi
t
}
r
emote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
K
e
e
ping
CodingGuidelines: add Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
gi
t
-r
e
mote-te
s
tpy:
f
ix path
h
ashing on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib: don't c
a
l
l
"exit" in
s
e
t
up_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-
d
ifftool:
use git
-
mer
g
etool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next