repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
contrib/fast-import/import-zips.py: use spaces instead of tabs
2013-02-24
Da
v
id Aguilar
c
ontrib/fast-import
/
i
m
port-zips
.
py: use s
p
aces instea
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib
/
f
a
s
t-
i
m
p
ort/import-zips
.
p
y: fix b
r
oken
e
rror
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
f
ast-import: use a low
e
rcase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
c
o
ntr
i
b/cre
d
en
t
ial: use a lower
c
a
se "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
c
vsimport: use a lowerc
a
se "usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-
c
vsimport: use a lowerca
s
e "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsexportcommit:
u
s
e
a lowercase "usa
g
e:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-arc
h
import: u
s
e a lowerca
s
e
"
usage:
"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one-file: us
e
a low
e
r
c
as
e
"usag
e
:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
git-relink: use
a
l
ow
e
rcase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
i
lar
git
-
s
v
n: use a lower
c
ase "usag
e
:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
git-sh-setup: us
e
a low
e
rcase "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
lar
p4merge: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid
A
g
u
ilar
diff
t
o
ol
-
-helper: fix printf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Agu
i
lar
doc: generate a
l
i
st of valid merge
t
ools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib: ad
d
fu
n
ctions fo
r
finding a
v
ai
l
able
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
av
i
d Aguil
a
r
mergetool--lib: imp
r
ove
the help text in
g
ues
s
_me
r
ge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mergetool
-
-lib: sim
p
lify co
m
m
and expres
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
u
ilar
mergeto
o
ls:
s
implify how we handle "v
i
m" and "defaul
t
s"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
mergetoo
l
--
l
ib: improve show_
t
ool_help()
output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim: remov
e
redun
d
ant diff com
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David A
g
u
ilar
mergetools/p4merge
:
Honor $TMP
D
IR for
the
/
dev/nu
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguil
a
r
me
r
get
o
ols/p4merge: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mer
g
e
tool--li
b
: Allow cu
s
tom
c
omm
a
n
ds t
o
o
verride b
u
ilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
git
k
: Rename 'tagcontents'
t
o 'c
a
ched_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
i
d Ag
u
ilar
gitk:
T
e
ach "Rere
a
d references" t
o
reload t
a
gs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d
A
guilar
mergetoo
l
,di
f
ftool: Document --tool-help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool: D
i
sable --sy
m
l
i
n
ks on
c
yg
w
in
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
difftool: H
a
n
dle
compa
r
e()
r
e
turni
n
g -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guil
a
r
d
ifft
o
o
l: Wrap long l
i
ne
s
for r
e
adability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
ui
l
ar
d
iffto
o
l: Check al
l
return
c
odes
f
rom com
p
are()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
difft
o
ol
:
Handle findin
g
m
ergetools/ in
a
p
a
th with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
diffto
o
l:
Use symlinks w
h
en dif
f
ing
agains
t
t
h
e worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
ol: Call the
temp d
i
rector
y
"git-dif
f
t
o
ol"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
dif
f
tool
:
Move option
v
alues
i
n
to a
h
ash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
d
i
f
f
to
o
l: El
i
minat
e
glo
b
a
l vari
a
bles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool
:
S
i
mpli
f
y prin
t
_
tool_help
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
A
guilar
t7
8
0
0:
Test difftool passing arg
u
ments
t
o diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
avi
d
Agu
i
lar
mergetool
:
Provide an emp
t
y
file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d
A
guila
r
Makefile:
Improve c
o
mpiler header dependency che
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
mergetools/meld: Use '--out
p
u
t
' when ava
i
lable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ool--l
i
b: Refactor
t
ools into separate fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
merget
o
ol
-
-lib
:
Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
diff
t
oo
l
-
-
helper:
Ma
k
e
s
t
yle consistent w
i
th git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
a
vid Aguilar
t
/t750
3
-pre-commit-hook
.
sh
:
A
d
d GIT_
P
REFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
git-mergeto
o
l--lib: Make v
i
mdiff retain t
h
e current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d
Ag
u
ilar
git:
R
emove handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide G
I
T_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d
Aguilar
su
b
modu
l
e
syn
c
: Up
d
ate "submo
d
ule
.
<name>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David A
g
ui
l
ar
merget
o
ol: Skip autoresol
v
ed paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David A
g
uilar
D
o
cume
n
tation: Explai
n
git-mergetool's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Mak
e
file: Remove us
a
ge of d
e
pr
e
cated
P
y
t
hon "has_k
e
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
difftool: Fix '--gui' whe
n
diff
.
gu
i
tool
is unconfi
g
ured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d
Agui
l
a
r
t
7
800-difftoo
l
.
sh:
T
est mergetool
.
pro
m
pt
f
all
b
a
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
dif
f
tool: Update co
p
yright notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
difftool:
U
se eval to
ex
p
and
'
--
e
x
t
cmd' expressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
d
iff
t
ool: Add '-x' and as an
a
lias for '--
e
xtcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
il
a
r
t7800-
d
i
ff
t
o
ol
.
s
h: Simpl
i
f
y
the --extc
m
d test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
git-dif
f
.
txt: Link
to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d Aguilar
di
f
ftool: Allow specify
i
ng unconfigu
r
ed com
m
an
d
s
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid A
g
uil
a
r
difft
o
ol--he
l
per: Remove u
s
e of the GIT_MERGE
_
TOO
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Agu
i
lar
difftoo
l
--helpe
r
:
Update copyright an
d
remove distracti
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
a
r
git-
d
iffto
o
l
:
Add '--
g
u
i' f
o
r
s
electing a GUI
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
t7800-diffto
o
l: Set a bogus tool fo
r
use by test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Agui
l
ar
h
elp: Do
n
ot unneces
s
ar
i
ly look for
a rep
o
sitory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguil
a
r
sub
m
od
u
le
.
c
:
Sque
l
ch a "use before assignm
e
nt" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
diff: genera
t
e pretty
file
n
ame
s
in prep_temp_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
Agui
l
a
r
c
ompat:
add a basena
m
e() compatibili
t
y fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
com
p
at:
a
dd
a
mkstemps() co
m
patibili
t
y fu
n
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-repla
c
e
t
o
.
gi
t
ignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David A
g
uilar
merge
t
ool--lib: add su
p
p
o
rt for ar
a
xis
m
erge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
me
r
g
e
t
o
ol--lib: spec
i
alize diff o
p
tions for em
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
A
guilar
mergetool--l
i
b: simplify A
P
I us
a
ge by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
ff
t
ool/mergetool: refact
o
r comman
d
s to use git-merg
e
tool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merge
t
ool: use $(
.
.
.
) inst
e
ad of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
gu
i
lar
bash completion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add
s
u
p
p
ort for a d
i
f
ftool
.
prom
p
t c
o
nfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
d
i
fftool:
add various git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
ilar
difftool: move 'g
i
t-
d
ifftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
Aguil
a
r
dif
f
tool: add a -y shortcut for
-
-n
o
-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: us
e
perl
b
uilt-i
n
s when test
i
ng
f
or msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: rem
o
ve the bac
k
up file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
diffto
o
l: remove merge o
p
tions for
opendi
f
f
,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguilar
ev
e
ryday
:
u
s
e the dashl
e
ss form of gi
t
-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contr
i
b/dif
f
t
ool
:
use a separate con
f
ig namespace
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
id Aguilar
contrib/diff
t
ool: Don'
t
repeat merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difftoo
l
:
put the
c
ur
s
o
r
on the editab
l
e file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguil
a
r
difftool: fix
documentati
o
n prob
l
ems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Agu
i
l
a
r
contrib: add 'git dif
f
tool
'
fo
r
launching co
m
mon me
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-m
e
rgetoo
l
: pr
o
per
l
y handle "git mergetool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
te
s
ts:
a
dd a testcase fo
r
"git s
u
b
m
odul
e
syn
c
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Agu
i
lar
git-subm
o
dule: add "sync
"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
A
guilar
git-
s
ubmodule: replace duplicated c
o
d
e with a m
o
dule_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguil
a
r
[PAT
C
H] gitk: Don't show
loca
l
chan
g
es
when we th
e
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree