repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/diff-tree-t-fix'
2014-07-22
John
K
eeping
completion: complete `git pus
h
--force-with-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: add
s
ome miss
i
ng opti
o
ns to `git p
u
sh`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
o
hn Keep
i
n
g
compl
e
ti
o
n: compl
e
te
"
unstuck" `git push --recurs
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keeping
reb
a
se:
o
m
i
t
patch-iden
t
ical c
o
mm
i
ts with --fork-
p
o
int
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keeping
rebase--am: use --che
r
ry-pick
i
nstead of --i
g
nor
e
-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
o
hn Keeping
c
o
mpletion
:
add missing options for git-me
r
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John
K
eep
i
ng
comp
l
e
tion
:
ad
d
a
note that
m
erge options are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John K
e
epin
g
builti
n
/
mv: fix out of b
o
unds wri
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
eping
builtin/m
v
: don't use memory after f
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
utf8
:
use
correct type for values in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keepi
n
g
u
t
f8
:
fix iconv error det
e
ctio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n Keeping
note
s
-utils: handle boolean
n
otes
.
rewritemode
c
orrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: remove redund
a
nt object in git-
h
ttp{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keepin
g
p
u
ll: suppress err
o
r wh
e
n no
r
emot
e
ref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
complet
i
on: handle --[no-
]
fork-point options
to gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Joh
n
Ke
e
ping
completion: co
m
plete me
r
g
e
-base op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John
K
eeping
re
b
ase:
fix
fork-poin
t
with zero argum
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Ke
e
p
i
n
g
r
e
base: u
s
e reflog to fin
d
common
bas
e
with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keepi
n
g
pull: use merge-base
--fork-poi
n
t
w
h
en appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n Ke
e
ping
p
eek-remote: remo
v
e
deprecat
e
d
alia
s
of ls-
r
emote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
oh
n
Ke
e
ping
lost-fo
u
nd: r
e
move deprecat
e
d command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
tar-tree: remove deprecated comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-co
n
fig:
r
e
m
o
ve dep
r
ecated alias for "g
i
t
con
f
ig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
D
o
cumentation/Makefile: make
Asci
i
Doc dblatex dir
configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recursive
:
fix parsing of "d
i
ff-alg
o
rit
h
m"
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Keepi
n
g
r
eset: ha
n
d
le submodule
w
i
th traili
n
g slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
r
m
: re-use
p
a
rse_pathspec
'
s trailing-
s
l
ash
removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
n Keeping
git_remote
_
h
e
lpers: r
e
m
ove lit
t
le used Pyt
h
on
libr
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn K
e
eping
r
e
v-p
a
rse(1): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Keep
i
ng
r
e
v-parse:
remove restrictions on so
m
e opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
o
hn
K
eeping
pul
l
:
change the descri
p
t
i
on t
o
"integ
r
ate
"
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push
:
avoid suggestin
g
"
merging
"
remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
Keeping
git-co
n
fig(1): clarify p
r
e
cedence
of
m
ultiple v
a
lu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-config:
update doc f
o
r --
g
et wit
h
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: learn
about --m
a
n
-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
ompl
e
tion: handle unstuck form of base git opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
fast-im
p
ort: allo
w
moving th
e
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
fast-i
m
port: allow ls or
f
ilecopy of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import:
set valid m
o
de on root tr
e
e in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keepin
g
t
9
300: document fast-import empt
y
pat
h
i
s
su
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
su
b
module: d
r
o
p
the top-level
r
equir
e
m
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-parse: add --
p
refix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eepin
g
submodule: show ful
l
path in e
r
ror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eep
i
ng
t7403: add missing && cha
i
ning
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: mod
e
rnize st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eepin
g
t74
0
1: make inden
t
ation consist
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
merg
e
too
l
--lib: refactor {diff,merge
}
_
c
m
d
logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation/Makefile: mo
v
e i
n
fodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
Keeping
D
o
cumenta
t
i
on/Make
f
ile: fix spac
e
s
around a
s
s
ignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Kee
p
ing
ad
d
--inter
a
ctiv
e
: respect diff
.
algo
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepin
g
git-gui: fix fi
l
e name handling
with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
f
e
tch: d
o
n't
t
ry to update unfetc
h
ed
tr
a
cking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
e
e
p
i
ng
difftool
:
fix dir-diff
w
he
n
file d
o
es not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
hn Keeping
m
erge-tree
:
h
a
ndle directory/emp
t
y conflict co
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
o
hn Keeping
t/M
a
kefile: don'
t
define TES
T
_RES
U
LT
S
_DIRECTORY recu
r
siv
e
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
K
eeping
con
t
ri
b
/subtree: do
n
't delete remote branches if sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
Keeping
test output: respe
c
t
$TEST_OUTPU
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn
Keeping
t/Mak
e
file: re
m
o
v
e sm
o
ke t
e
st
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepin
g
m
e
rge-tree: fi
x
t
yp
o
in "
b
oth ch
a
ng
e
d
ide
n
tically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
o
h
n Keeping
t/Mak
e
file
:
fix result hand
l
ing
w
ith TE
S
T_OUTPUT_DIREC
T
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn
K
eeping
transport-helper: a
d
d
'si
g
ned-t
a
gs' capabili
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
trans
p
ort-helper: p
a
ss -
-
sig
n
e
d-tags=w
a
r
n
-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn K
e
eping
fa
s
t-
e
xport: ad
d
--s
i
gned-
t
a
g
s
=
warn
-
strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
t/tes
t
-lib
.
s
h
: fix TRASH_DI
R
ECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Kee
p
ing
merge-tree:
don
'
t print entries that m
a
tch "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
Keeping
gitremote-helpe
r
s(1):
clarify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
sub
m
odule: print gr
a
p
h out
p
ut
n
ext t
o
su
b
module log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
eeping
diff: allow unstuck argumen
t
s with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
i
ng
gi
t
-merge(1)
:
d
o
c
u
m
e
n
t
d
iff-algorith
m
opti
o
n to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
b
i
sect: av
o
id signed in
t
eger
o
verflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
ng
diffcore-
b
reak
:
don't divide by
zer
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keep
i
ng
t7800:
r
u
n --d
i
r-diff tests with and withou
t
s
y
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800:
fix tests when d
i
f
ftool 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
hid
e
grep out
p
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
diff
t
o
ol: don't ov
e
rwri
t
e
modified
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--symlinks' specific test
t
o the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
Keeping
merg
e
-tree: fix typo in merg
e
-tree
.
c:
:
un
r
esolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c
:
f
ix fre
a
d
error handli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
entry: fix
filt
e
r lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
t2003: moder
n
ize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difft
o
ol --dir-diff: symlin
k
all fil
e
s matc
h
ing th
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Kee
p
ing
di
f
f
tool: avoid dou
b
le slashes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
git-diffto
o
l
(
1
): fix formatting of
--sym
l
ink desc
r
i
ptio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n Ke
e
p
i
n
g
Revert "grap
h
.
c:
m
a
rk
p
riva
t
e fi
l
e-scope
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Keeping
Makefile: make m
a
ndir
,
h
tm
l
dir and infodir
abso
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keeping
rebase
-i: respect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
p
ing
combine-diff
.
c: teach combined diffs about
l
ine prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
.
c
: use dif
f
_line_prefix
(
)
w
her
e
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff: add diff_line_prefi
x
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make constant string
argume
n
ts
c
onst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: write
prefix to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
e
p
ing
g
raph: o
u
tput pad
d
ing
for merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038
:
add tests for "diff -
-
cc --ra
w
<tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
built
i
n
/
apply: tighten (dis)similarity in
d
e
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
p
i
ng
mergetool
-
-lib:
list use
r
con
f
igured tool
s
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Keeping
Rename {g
i
t
- => g
i
t}remote-hel
p
ers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
o
dingG
u
idelines: add Pyt
h
on codi
n
g
guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
K
e
eping
git-remo
t
e-testpy
:
fix pa
t
h hashing on Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Ke
e
ping
merg
e
tool--lib:
d
on'
t
call "ex
i
t" in
s
e
t
u
p_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-difftool: use git-me
r
getool--lib
fo
r
"--tool-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next