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: use a lowercase "usage:" string
2013-02-24
D
a
vid
Aguila
r
c
ontrib
/
fast-imp
o
rt
:
use a lowercas
e
"us
a
ge:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
contrib/crede
n
tial: use
a l
o
wercas
e
"
u
s
a
ge:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
gi
t
-cv
s
impo
r
t
: us
e
a lo
w
ercase
"usa
g
e:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimpo
r
t:
u
se a lo
w
ercas
e
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
g
i
t-cvs
e
x
portcommi
t
: use a lowercase "
u
sage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-
a
rchimport: use a
l
owercase
"us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
m
erge-one-file: use
a lowercase
"
usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uilar
g
i
t-relink:
u
s
e a lowercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguil
a
r
git
-
s
vn: us
e
a lowe
r
case "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-sh-setup: use a lowerc
a
se "u
s
a
g
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
i
d A
g
uilar
p
4
merg
e
: f
i
x printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
i
d Aguilar
difftool-
-
helper: fix printf
u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate
a
lis
t
o
f valid
merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
mergetool
-
-
l
ib
:
add functions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mer
g
etool--lib:
i
mprove the help text in gue
s
s_mer
g
e_
t
ool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
mergetool--lib
:
simplify command expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguila
r
m
e
r
geto
o
l
s: simplify
ho
w
we handle
"vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
u
ilar
mergetool-
-
lib: i
m
prove
s
how_
t
ool
_
help()
o
utput
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
mergeto
o
l
s
/vim: re
m
ove
redunda
n
t
diff co
m
m
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Aguilar
mergetools/p4merge: Honor $T
M
PDIR
f
or the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
m
ergetools/
p
4merge:
Hand
l
e "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid Aguilar
m
e
rget
o
o
l--lib: A
l
low cu
s
tom command
s
to overrid
e
bui
l
t
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rename 'tagcontents'
to 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teac
h
"Reread refe
r
e
n
ce
s
" to reload ta
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Ag
u
ilar
m
er
g
etool,difftool: Document --tool-
h
elp consisten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid
A
g
ui
l
ar
difftool: Di
s
able -
-
symli
n
ks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handle co
m
par
e
() retur
n
i
n
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id Agui
l
ar
difftool: Wrap long lines for
r
ead
a
bi
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguila
r
difftool: Check al
l
retur
n
codes from co
m
pare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Agu
i
lar
diff
t
ool: Handle finding merge
t
ools/ in
a pat
h
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool
:
U
se symlinks when diffin
g
against the
w
orktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
l
ar
d
i
fftool: Call the temp dire
c
tory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
t
o
o
l: Mov
e
opti
o
n value
s
into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool
:
Eliminate global
v
ariables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool: Simplify
pr
i
n
t
_too
l
_help
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Agui
l
a
r
t7800: Test
d
ifftool
p
assing
argum
e
nts to di
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Provide
a
n
e
mpty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Aguilar
Ma
k
efile:
I
mprove compiler
h
eader dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Aguilar
merg
e
tools/m
e
ld: Use '--output' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mer
g
etool--l
i
b:
R
efac
t
o
r
tools into s
e
parate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agui
l
ar
mergetool--lib:
Make sty
l
e
consistent wi
t
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
dif
f
tool
-
-helpe
r
: Make style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David A
g
uilar
t
/
t7503-pre-commit-ho
o
k
.
sh: Ad
d
GIT_P
R
EFIX te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guil
a
r
git-mergetoo
l
-
-
lib: Make vimdiff ret
a
in the curr
e
nt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
A
guilar
git: Remove handling for
G
I
T_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d Ag
u
ilar
s
e
tup: Provide GIT_PREFIX
to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
s
u
bmodule sync: Up
d
ate
"
s
ubmod
u
le
.
<
n
ame>
.
u
r
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Agui
l
ar
mergetool:
Sk
i
p au
t
oresolve
d
path
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Do
c
umentat
i
on: Ex
p
lain git-mergeto
o
l's u
s
e
of
te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Aguilar
Makefile: Remove u
s
age
of deprecated Python "has
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Agui
l
ar
dif
f
tool: Fix '--gui' when
d
i
f
f
.
guitool
i
s unc
o
n
f
igured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Aguila
r
t7800-d
i
fft
o
ol
.
sh:
T
est
m
ergetool
.
promp
t
fal
l
back
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Aguilar
difftool: Upda
t
e copyright notices to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difft
o
o
l
: Use eval to expand '--
e
x
tcmd' express
i
on
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
u
il
a
r
difftool: Add '
-
x' and as
a
n alias for '--extcm
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Ag
u
ilar
t7800-difftool
.
sh: Simplif
y
the --e
x
tcmd te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
git-diff
.
t
xt:
L
i
nk to git-d
i
fftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Agui
l
ar
difftool: Allo
w
specif
y
ing
u
nconfigur
e
d comma
n
ds w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id
A
guilar
difftool--helper:
R
emove use of t
h
e
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id A
g
uilar
d
i
fftool--hel
p
e
r:
U
pdat
e
copyright and remove d
i
stracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguilar
g
i
t
-difftool:
Add '--gui' for selecti
n
g a GUI too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-
d
ifftoo
l
:
S
et a bogus too
l
for use
b
y tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Agu
i
lar
help: Do no
t
unnecessa
r
ily l
o
ok
for a re
p
ository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David A
g
uilar
s
ubm
o
du
l
e
.
c
:
Squ
e
lch a "use
before assignment" warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
diff: genera
t
e p
r
etty filen
a
mes in p
r
ep
_
temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
basen
a
me() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
u
ilar
compat: add a mkstemp
s
() compatibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
g
i
t-replace
t
o
.
giti
g
nore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
il
a
r
mergetool--lib
:
add support
f
or araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id
A
gu
i
lar
mergetool--
l
ib: spec
i
aliz
e
di
f
f options for e
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
Ag
u
i
l
ar
mergetool--lib: s
i
mplify API usage by
r
emo
v
ing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l/mergetool: refactor comm
a
nd
s
to
use
git-m
e
rgetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
mergetool: u
s
e $(
.
.
.
)
i
nstead
of
`
backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
b
as
h
comple
t
ion:
a
dd git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
diffto
o
l
: add s
u
pport fo
r
a
difftool
.
pro
m
pt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add various git-
d
ifftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
guilar
d
i
fftool:
m
o
v
e
'
git-
d
if
f
too
l
' o
u
t
o
f contr
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: add a
-
y sh
o
rtc
u
t for --n
o
-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
diff
t
ool: use perl built-ins when testing
for msy
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ila
r
difftoo
l
: remove
me
r
g
e
options for ope
n
dif
f
, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguilar
e
v
e
ry
d
ay:
u
s
e
t
he dashless form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib
/
difftool: use a separate con
f
ig names
p
ace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
vid Aguilar
contr
i
b/dif
f
t
o
ol:
Don
'
t re
p
eat merg
e
tool candidat
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
Agu
i
lar
difft
o
o
l: pu
t
the cursor on the editab
l
e
f
ile
f
or Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
di
f
ftool:
f
i
x documentation pr
o
blems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
avid
Agui
l
ar
contrib: add
'
git difft
o
ol' for lau
n
c
h
ing common
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguila
r
git-mer
g
etoo
l
:
prop
e
rly handle "git mergetool
-
- fi
l
ename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
Aguilar
tests: add a testcase for "git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git
-
submodule: add "syn
c
" c
o
m
mand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguil
a
r
g
it-submodule
:
replace duplicated code with a module_l
i
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David A
g
uilar
[PATCH] gitk: Don't show
l
o
c
al changes when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree