repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 2.1.0-rc0
2014-07-16
John Keeping
r
ebase: omi
t
patch
-
i
d
e
n
tical com
m
its
with --for
k
-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keeping
re
b
ase--am: u
s
e
-
-cherry-pick
i
nstead of
--
i
gnore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n Keeping
comp
l
etion: add m
i
ssing options f
o
r
g
it
-
m
e
r
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keep
i
ng
c
o
mpletion: add a note tha
t
merge options are
s
ha
r
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John
K
e
eping
builtin/mv: fix
o
ut of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
built
i
n/mv: don't us
e
me
m
ory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
utf8: use correct t
y
p
e
for
values in i
n
te
r
val table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
ng
utf8:
fix iconv
e
r
r
o
r detectio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepin
g
notes-utils: han
d
le bool
e
an
n
o
tes
.
re
w
rite
m
ode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
M
a
kefile: remove redu
n
dan
t
object in git
-
http{fet
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn Keepin
g
pul
l
: suppress e
r
ror when no rem
o
t
eref
i
s found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
c
ompl
e
tio
n
: handle --[no-
]
fork-point options to
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
comp
l
e
t
ion: com
p
lete m
e
rge-b
a
se o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn Kee
p
ing
rebase
:
fix for
k
-
p
oint with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John
Keeping
rebase: use r
e
fl
o
g to fi
n
d comm
o
n
b
ase with ups
t
ream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John
K
eeping
pull: u
s
e
merge-base --fork-p
o
int when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
p
eek-remote: remove deprecated
alias o
f
l
s-re
m
ote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-
f
ound: remove de
p
reca
t
ed command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
tar-tree: remove
depr
e
ca
t
ed command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn K
e
eping
repo-config:
r
emo
v
e depre
c
a
t
ed al
i
as fo
r
"
git c
o
n
fig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
oh
n
K
e
eping
Documentation/Makefile:
m
ake As
c
iiDoc dblatex dir configura
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge
-
rec
u
rsive:
f
ix parsing of "diff-a
l
gorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
res
e
t
:
handle sub
m
odul
e
wi
t
h trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm:
r
e-use parse_paths
p
ec's
t
raili
n
g-slash r
e
m
ov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keep
i
ng
git_remote_helpe
r
s: remov
e
little used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
rev-parse
(
1)
:
lo
g
ically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-pa
r
se:
remove restrictions on som
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
p
u
l
l: ch
a
nge the descri
p
tion
to "integrate" ch
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
p
ush:
a
void
s
ugges
t
ing
"
merging" remote chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
eping
git-con
f
ig(1): cla
r
i
fy p
r
ecedence
o
f mult
i
pl
e
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Jo
h
n Keeping
gi
t
-config: update do
c
for --get
with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
eeping
c
o
m
p
letion: learn a
b
out -
-
man-p
a
th
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
com
p
letion:
hand
l
e unstuck form
o
f base
g
it optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fast-impor
t
: allow
moving the root tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keepi
n
g
fast-
i
m
port: allow ls or f
i
lecopy of th
e
r
o
o
t
t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
fa
s
t-import: se
t
valid
m
ode on root t
r
ee i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t93
0
0
:
d
ocu
m
ent fast
-
i
mpo
r
t
empt
y
path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
subm
o
dule:
drop the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
ep
i
n
g
r
ev-parse: add --p
r
ef
i
x o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
submod
u
l
e
: show ful
l
path in error m
e
ssa
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Ke
e
p
ing
t7403: add missing
&& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7
4
03:
modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make indentation consist
e
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool--lib: re
f
actor {dif
f
,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
o
c
umentation/Mak
e
file: move infodir
t
o be wi
t
h other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
Keeping
Documentation/Makefile
:
fix spaces around assign
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add
-
-interactive: respect di
f
f
.
algori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
hn Keeping
gi
t
-gui: fix
f
ile name handling wit
h
n
on-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't try
to update unfetched t
r
a
c
kin
g
re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
e
ping
diffto
o
l:
fix dir-diff when file does n
o
t exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Kee
p
ing
mer
g
e-t
r
ee: handle
d
irectory
/
e
m
pty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefi
l
e: don't
define TEST_R
E
SULTS_DIRECTORY recursi
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
Keeping
contrib/subtree
:
don
'
t
del
e
te remote bran
c
hes if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
K
eeping
test output: respect $TEST_
O
UT
P
UT_DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn K
e
eping
t
/Makefile: remove sm
o
ke te
s
t
targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keeping
merge
-
tree: fix t
y
po in
"
b
o
t
h changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John
Keeping
t/
M
akefile: fix result handling 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 'signed-
t
ags'
c
apability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tr
a
ns
p
o
rt-help
e
r: pass --signed-ta
g
s=war
n
-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
fast-ex
p
ort: add --signed-
t
ags=w
a
rn-strip m
o
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
t
/
t
e
s
t
-l
i
b
.
sh: fix
TRASH_DIR
E
CTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n
K
eeping
mer
g
e-tree: don't
print entries that matc
h
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keepi
n
g
gitremote-
h
elpers(1): clarify
r
e
fspec be
h
aviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keeping
submodule: p
r
int graph output
next
to
s
ubm
o
dule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
di
f
f
: al
l
ow
u
nstuc
k
argu
m
e
n
ts with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-
m
erge(1)
:
d
o
cument d
i
ff-algorithm optio
n
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
bi
s
ect: avoid sign
e
d integer overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
ng
d
i
ffcore-break: don't
divide
b
y z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
run --dir-diff tests w
i
th and without
symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
epi
n
g
t7800: fix tests when difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800:
d
on't h
i
de grep
o
ut
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
difftool: d
o
n't overwrite modifie
d
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: move '--symlink
s
'
specific test to
the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
oh
n
Keeping
merge-tree: fix typo in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Kee
p
i
ng
r
e
fs
.
c
: fix frea
d
e
r
ror hand
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
en
t
ry: fix fil
t
e
r
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
t2003: moder
n
ize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pin
g
difftool --dir-diff: sy
m
link all
f
ile
s
matchi
n
g the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
d
i
fftoo
l
: avoid
d
o
uble
slashes in
s
y
m
l
ink
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Kee
p
ing
git-difftool(1)
:
fix fo
r
ma
t
ting
of --
s
ymlink d
e
script
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
eping
Revert "graph
.
c: mark private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Ma
k
efile: make mandir, htmldir and infod
i
r absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i:
r
espect
core
.
co
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
comb
i
ne-diff
.
c:
t
each co
m
bined diffs about li
n
e pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
diff
.
c: use diff_line_prefix() where
a
pplicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff: ad
d
diff_line_prefix functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff
.
c: ma
k
e con
s
ta
n
t st
r
ing arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
di
f
f: write prefix to the c
o
rrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output paddin
g
f
or merge
s
ub
s
equen
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tests for "diff --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
builtin/apply: tig
h
ten (di
s
)similarity index p
a
rsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
h
n
Keeping
merg
e
t
ool--lib: list
u
ser configured
t
ools in
'
--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
K
eeping
Ren
a
me {git- => git}re
m
ote-h
e
lpe
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keep
i
ng
Cod
i
ngGuidelines:
a
dd Pyth
o
n coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keepin
g
gi
t
-rem
o
te-
t
e
s
tpy: fix p
a
th
hashing o
n
Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
ping
mergetool--lib:
d
o
n't call "exit
"
in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
in
g
git-difftool: use git-m
e
rg
e
t
ool--lib
for "--tool-help
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merge
t
ool:
d
on't hardcode 'mer
g
e
t
o
o
l' in show_to
o
l_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-mergetool: rem
o
v
e
redundan
t
assign
m
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
eping
git-mergetool: move show_tool_help to merge
t
ool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next