repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jl/nor-or-nand-and' into maint
2014-03-11
Joh
n
Keeping
bui
l
tin/mv: fix
ou
t
of b
o
unds writ
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Ma
k
efile: remove
r
edu
n
d
a
nt
o
bject in git-ht
t
p
{
f
e
tch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Jo
h
n Keeping
pull: suppress e
r
ror
w
h
e
n no remote
r
e
f
is fou
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keeping
completion:
h
a
n
dle --[no-
]
fork-point opti
o
ns to g
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eeping
completion: complete m
e
rg
e
-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John K
e
e
ping
rebase:
f
i
x
fo
r
k-point with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John K
e
e
p
i
n
g
rebase: use reflo
g
to find common base w
i
t
h
up
s
tream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn Keeping
p
u
l
l:
u
se merge-base --fo
r
k-
p
oint when
a
ppropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-remote: remove
d
e
p
recat
e
d alias of ls-r
e
mote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
l
o
st-
f
oun
d
: remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tr
e
e: r
e
move deprecated comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
ing
repo-config
:
remo
v
e deprecated
alias fo
r
"
git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
hn
Keeping
Docum
e
ntation/Makefile: ma
k
e Asc
i
iDoc dbl
a
t
e
x dir configu
r
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keepin
g
merge-r
e
cursive: fix parsing of "diff-
a
l
g
o
r
ithm"
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Kee
p
ing
reset:
h
a
nd
l
e submodule
with traili
n
g sl
a
sh
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keep
i
n
g
rm: re-use
parse_pathspec's trailing-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
K
eeping
g
i
t_remote_h
e
lpers: r
e
move l
i
ttle used P
y
thon library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
parse(1
)
: log
i
cal
l
y
group option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Keepin
g
r
e
v-parse:
remo
v
e re
s
trictions on
some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pu
l
l: change the
descri
p
ti
o
n to "int
e
gr
a
te" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
e
ping
push: avoid suggesting "merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
git-config(1):
cla
r
if
y
pr
e
cede
n
ce of m
u
ltiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-confi
g
: update doc for --get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
completion: l
e
arn
a
bout -
-
man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
eping
c
ompletion: handle unstuck form
o
f base g
i
t
opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
fast-imp
o
rt
:
a
llow moving t
h
e
root
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-imp
o
rt
:
allow ls or file
c
op
y
of t
h
e
ro
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-imp
o
rt: se
t
v
a
lid mode on
r
oot tree
i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keep
i
ng
t930
0
: docum
e
n
t
fast-import e
m
pty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
s
ub
m
o
d
u
le:
d
r
op the top-le
v
el requ
i
r
ement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepin
g
rev-parse: ad
d
-
-prefix op
t
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submo
d
u
le
:
show
f
ull p
a
th in
e
rror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
ep
i
ng
t7403:
add
missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t7403: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7401: m
a
ke indentation
c
onsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool--lib: refactor {diff,me
r
ge}_
c
m
d logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
Keeping
Documentation/Makefile
:
move inf
o
dir to
be
w
ith other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
Documen
t
ation/Ma
k
e
f
ile: f
i
x sp
a
ces around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
K
eeping
add--interac
t
ive: resp
e
ct diff
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
K
e
eping
git-gui: fix file
name
ha
n
d
ling with non-empty pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Kee
p
ing
fet
c
h:
don't try
to update unfetched t
r
ack
i
ng re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Kee
p
ing
d
i
fft
o
ol: f
i
x dir-
d
i
f
f when file doe
s
no
t
exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Keeping
m
e
rge-tree
:
h
a
n
dle directo
r
y/empty conflic
t
c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Joh
n
Keep
i
ng
t/Makef
i
l
e: don't define TEST_RESULTS_DIREC
T
ORY recursively
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 r
e
mo
t
e
branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n Ke
e
ping
test
outpu
t
:
respect $TEST_OUTPUT_DI
R
E
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
e
e
ping
t
/Make
f
ile:
rem
o
ve smoke test targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Ke
e
p
i
ng
merge-tree: fix typo in "both changed identi
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
o
hn Keepi
n
g
t/Ma
k
efile: fix resu
l
t
h
andling with TES
T
_OUTPUT_DIREC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Kee
p
i
ng
t
ransport-helper: add
'signed-tags'
capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Ke
e
ping
tran
s
p
o
r
t
-
helpe
r
: pass --signed-
t
ags=warn-stri
p
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-exp
o
rt: a
d
d --
s
igned
-
tags=
w
arn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/
t
e
st-lib
.
sh
:
fix
TRASH_DIR
E
CTO
R
Y
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
merge-tree: don'
t
print entries
t
ha
t
match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n
Kee
p
ing
g
i
t
r
emote-helpers(1
)
: clarify r
e
fspec
b
ehavio
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
subm
o
dul
e
: pr
i
n
t
graph output next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
e
eping
diff: allow unstuck argum
e
nt
s
with --diff-
a
lgorith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keepi
n
g
git
-
merge(
1
)
:
document diff-algorith
m
o
ption
t
o
merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
b
i
sect: avoid signed i
n
t
e
ger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n
Kee
p
ing
diffcore-break:
do
n
't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t
7
800: run --
d
ir-
d
iff tests with and
w
i
t
hout symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t
7
800:
f
ix tests when
diff
t
ool uses --no-symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800:
d
on't hi
d
e grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Ke
e
ping
difftool: d
o
n't overwr
i
te modified
file
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: move '--symlinks' specific test
t
o
th
e
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:
:
u
n
reso
l
ved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
K
e
e
pin
g
refs
.
c
:
f
i
x fread
e
rror handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry:
f
i
x filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: modernize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
difftool --dir-diff: s
y
m
l
ink all files matching th
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
d
iffto
o
l:
a
void doub
l
e
slashes in symlink
t
arge
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Kee
p
i
n
g
gi
t
-diff
t
ool(1):
fix formatting of --sy
m
link descr
i
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c:
mark p
r
ivat
e
file-s
c
ope s
y
mbols
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keepin
g
Makefile
:
make mandir, htmldir and inf
o
dir a
b
solute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
rebase -i:
r
espect
core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
com
b
ine-di
f
f
.
c: teach
c
om
b
ined diffs about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use d
i
ff_line
_
prefix() where applica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keepi
n
g
diff: add diff_line_prefix fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make constant string arguments
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff:
w
rite
p
refix to
the c
o
rrect
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keeping
g
r
a
p
h: outpu
t
pad
d
i
ng for merge
s
ubsequen
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Kee
p
ing
t403
8
: add
t
ests f
o
r
"
d
iff
-
-
c
c -
-
raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: tighten
(
dis)similarity
index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
h
n Keepi
n
g
mergetool-
-
lib: list user conf
i
gured tool
s
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keep
i
ng
R
en
a
me {
g
it- =>
git}remo
t
e
-he
l
per
s
.
tx
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Joh
n
K
eeping
C
o
dingGui
d
eline
s
: add Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
g
i
t
-remot
e
-testpy: fix path
ha
s
hing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n
Keeping
mergetool--
l
ib: don'
t
call "e
x
it" in setu
p
_
t
o
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
pin
g
git-difftool: use gi
t
-mergetool--lib for "--
t
ool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Kee
p
ing
git-mergetool: don't
h
a
rd
c
o
de 'merg
e
tool' in show
_
tool
_
help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool:
remo
v
e redunda
n
t assi
g
nment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
m
ergetool: move
show_tool_help to
me
r
g
e
t
ool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Kee
p
i
n
g
git-rem
o
t
e-testpy: cal
l
print as a functio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Ke
e
pi
n
g
git-rem
o
te-testpy: d
o
n't do un
b
uf
f
ered
text
I
/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Kee
p
ing
g
i
t-remote-testpy
:
hash bytes ex
p
l
icitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
sv
n
-fe: allow svnrdump_s
i
m
.
py to r
u
n with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
_r
e
mote_helpers: u
s
e
2
to3 if bui
l
ding
w
ith
P
y
tho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keep
i
ng
g
it_
r
em
o
te_helpers: force reb
u
ild
i
f
pytho
n
versio
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Jo
h
n Kee
p
ing
g
it-cvsimport
.
t
x
t:
c
v
s
ps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Joh
n
K
eeping
git-for-ea
c
h
-re
f
.
txt: 'raw'
is a su
p
ported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next