repo.or.cz
/
git.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: fix broken error message
2013-02-24
D
avid Aguilar
c
ontr
i
b/f
a
s
t
-import/import-zips
.
py:
fix b
r
ok
e
n error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/
f
a
st-import
:
use
a
lowercase
"u
s
a
ge:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uila
r
c
o
ntrib
/
credentia
l
: use a lowerc
a
se
"
u
sag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-c
v
simport: use a lowercas
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-cvsimport: use
a lowercas
e
"
us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguila
r
g
i
t-c
v
sexportcommit: use
a
low
e
r
case "u
s
a
g
e:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguil
a
r
git-archimport: use
a lowercase "usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-mer
g
e-one-file: use a lo
w
ercase "usage:" st
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-reli
n
k
:
use a lowerca
s
e "us
a
g
e:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-svn: use
a
l
ower
c
as
e
"usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-sh-setup: use a l
o
we
r
case "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
p4merge: fix
p
rintf usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
A
g
uilar
difftool--hel
p
er: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
doc: generate a lis
t
of
v
a
l
i
d
merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guil
a
r
mergetool--lib: add functio
n
s
f
or f
i
n
d
ing available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
m
er
g
e
tool--lib: improve
the
h
e
lp text in guess_me
r
ge_tool(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--l
i
b: simp
l
ify command
exp
r
essio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merget
o
ols:
simplif
y
how we handle
"
vim" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
rg
e
tool
-
-lib
:
i
mprove show
_
to
o
l_help() ou
t
put
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguila
r
mer
g
etools/
v
im: remove redundan
t
diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetoo
l
s/p4mer
g
e
:
Honor $TMPDI
R
for
the /dev
/
null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Aguil
a
r
mergetools/p4
m
erge: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d Aguilar
m
erge
t
o
o
l--lib: Allow custom
commands to o
v
er
r
ide
b
uilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
gitk: Re
n
ame 'tag
c
ontent
s
' to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gitk: Teach "Reread references" to
reloa
d
t
a
gs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Ag
u
ilar
m
ergetool,d
i
fftool: Docum
e
n
t -
-
tool
-
help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disable
-
-symlinks
o
n c
y
g
w
in
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: H
a
ndle compare() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
u
ilar
diff
t
ool: Wr
a
p l
o
ng lines for reada
b
ility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diff
t
ool: Check all
r
etur
n
cod
e
s
from co
m
pare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
A
guilar
difft
o
o
l
: Handle
f
inding mer
g
etools/ in a pat
h
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguila
r
difftoo
l
: U
s
e
sym
l
inks whe
n
diffing
again
s
t th
e
worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool:
Call the t
e
mp directory
"
git-difftool
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
d
ifftool: Move option
v
alue
s
into
a
hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eliminat
e
global v
a
riables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Simpl
i
fy pr
i
nt_to
o
l
_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
i
d Aguilar
t7800
:
Test difftool passing arguments to
diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
me
r
g
etool: Provide an empty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David A
g
uilar
Makefile: Improve comp
i
ler he
a
d
er dependency
c
h
e
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
m
e
r
g
e
t
ools/meld:
Use '
-
-outp
u
t'
w
hen avail
a
ble
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
me
r
getool--lib: R
e
factor tools i
n
to
s
e
pa
r
ate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rgetool--lib: Make st
y
le c
o
n
s
istent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
difft
o
ol--
h
elper: Mak
e
style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguila
r
t/t7503-pre-commit-hook
.
sh: A
d
d
G
IT
_
PREFIX tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git-mergetool
-
-lib: Make vimdiff re
t
ai
n
t
he current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
av
i
d Aguilar
git: Remove h
a
ndling
f
o
r
GIT_PREF
I
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
setu
p
:
Provide
G
I
T_PREF
I
X t
o
b
u
ilt-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David
Aguilar
submodule sync
:
U
p
d
ate "su
b
module
.
<name>
.
u
r
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
ergetool: S
k
i
p autoreso
l
ved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Doc
u
menta
t
i
on: Explain git-merge
t
o
ol's use o
f
t
emp
o
rar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguila
r
M
ak
e
file
:
Remove us
a
ge
o
f
d
eprec
a
ted P
y
thon "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
diff
t
ool: Fix '--gui' when dif
f
.
gui
t
ool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t780
0
-difftool
.
s
h
: Te
s
t merg
e
tool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update copyrig
h
t not
i
ces
to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
difftool: Use eval
t
o expan
d
'--ext
c
m
d
' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
l
a
r
di
f
f
tool: A
d
d '-x' a
n
d as an alias f
o
r '--extcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Agu
i
lar
t7800-d
i
fftoo
l
.
sh: Sim
p
li
f
y the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
uilar
git-
d
iff
.
txt
:
L
ink to g
i
t-
d
ifftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid
Aguilar
di
f
fto
o
l: Al
l
ow specify
i
ng
u
n
configured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguila
r
di
f
f
t
o
ol--helper
:
Remove use of th
e
GIT
_
MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d
Aguilar
d
i
f
ftoo
l
--helper: Update copyright
a
nd remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguil
a
r
git-difftool: Add '-
-
gui
'
fo
r
selecting a GUI
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7800-dif
f
tool
:
Se
t
a
b
o
g
us tool
for use
b
y tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
uilar
help
:
Do not unnecessarily l
o
ok f
o
r
a
repos
i
tory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
subm
o
dule
.
c: Squelch
a "use
before assign
m
ent" wa
r
ning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff
:
g
ener
a
te pretty filen
a
mes
i
n
pr
e
p_temp_bl
o
b()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
u
i
l
ar
compat: add
a
basename() compatibil
i
ty function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguila
r
compat: add a mk
s
t
emps() compatibili
t
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
Add git-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id
Agui
l
ar
merg
e
t
o
ol--l
i
b:
a
dd support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
m
e
rg
e
tool--lib: s
p
ecialize diff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguila
r
merg
e
tool--
l
ib: simplify API usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agui
l
a
r
dif
f
tool/
m
ergetool: refactor commands to use g
i
t
-merge
t
ool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
mergetool:
use $(
.
.
.
) inste
a
d of `
b
ackticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
bash
c
om
p
leti
o
n
: add git
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guilar
difft
o
ol
:
add suppor
t
for a d
i
fftool
.
p
rompt c
o
nfi
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
gui
l
ar
difftool: ad
d
v
a
rious gi
t
-
dif
f
tool tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
difftool:
m
o
v
e
'
git-
d
ifftool' out of con
t
r
ib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool
:
add a -y sho
r
tcut for --no-pro
m
pt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool:
u
se perl buil
t
-
i
n
s when
tes
t
ing
f
or
ms
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftoo
l
:
r
e
mov
e
th
e
bac
k
up file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
ilar
d
i
f
f
tool: remove merg
e
options
f
o
r
o
p
endiff, tkdif
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
ar
everyday: use the das
h
less form
of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Aguilar
contrib/
d
ifftool: use a s
e
parate
c
o
nfig nam
e
space f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib
/
dif
f
tool: Don't repeat merge
tool candi
d
ates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguila
r
difftool
:
put the curs
o
r on the editable file
f
o
r Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
id Ag
u
il
a
r
difftool:
f
ix documentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David
A
gui
l
ar
contrib:
a
dd 'git difftoo
l
' for
l
aunching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id
Ag
u
i
l
ar
git-mer
g
e
t
ool: proper
l
y handle "g
i
t mergetool --
f
ilename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
av
i
d Aguila
r
tests
:
add a testca
s
e for "git submodule
sync
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guila
r
git-sub
m
odule: add "sy
n
c" c
o
m
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-s
u
bmodule: rep
l
ac
e
duplic
a
ted code
wi
t
h a modul
e
_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguil
a
r
[
PA
T
CH]
gitk:
Don't show local changes
when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree