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
Makefile: replace "echo 1>..." with "echo >..."
2012-10-11
D
a
vid Aguilar
mergetools/p4merge: H
a
ndle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
A
gu
i
lar
m
e
rgetool--lib
:
All
o
w custom
c
ommands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vi
d
Aguilar
gitk
:
Rename 'tagc
o
ntents' to 'cac
h
ed_ta
g
content'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d
Aguilar
gi
t
k:
T
each "Re
r
ead references"
to relo
a
d
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
guila
r
mergetool,difftool: Docu
m
e
n
t
-
-
t
ool-help consi
s
ten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid
A
guilar
difftool: Disa
b
le --syml
i
nks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Ag
u
ilar
difftool: Handle co
m
pare
(
)
retur
n
i
ng -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool: Wrap long lines for
readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguil
a
r
difftool:
C
heck all ret
u
rn
codes from compare
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
g
u
ila
r
d
iff
t
ool: Han
d
l
e finding mergetools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
di
f
ftool: Use symlinks w
h
en
d
i
ffin
g
against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguila
r
dif
f
too
l
: C
a
l
l
the
tem
p
dir
e
c
tory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Agu
i
l
a
r
difftool: Mo
v
e option valu
e
s into a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id
A
guilar
difftool: Eliminate
global va
r
iables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguil
a
r
di
f
ftool:
S
implify
print_tool
_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
il
a
r
t7800
:
Tes
t
dif
f
tool passing argume
n
ts to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
m
e
rgetool:
P
r
o
v
i
d
e an empty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Imp
r
ove
co
m
piler
header dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetoo
l
s/meld: Use '--output' when
a
v
a
i
lable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Agu
i
lar
m
e
rge
t
o
ol--lib
:
Refactor tools
i
nto separate f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d A
g
uilar
m
e
r
getool--lib
:
Make style
c
o
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
u
ilar
difftool--helper: Make style cons
i
stent
with
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-commit-ho
o
k
.
sh:
A
dd GIT
_
PREFIX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id
A
guilar
git-mergetool--lib: Make vimdiff r
e
t
ain the
c
urrent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agui
l
ar
git: Remo
v
e handlin
g
fo
r
GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
l
a
r
setup: Provi
d
e GIT_
P
RE
F
IX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Ag
u
il
a
r
submodu
l
e sync: Update "submodule
.
<name>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David
Aguilar
mergetool: Ski
p
autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentat
i
on: Exp
l
ain git-me
r
getool'
s
us
e
of tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
av
i
d
Aguilar
Makefile: Remove us
a
ge of d
e
precate
d
Python
"
h
as_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Agu
i
lar
difftool: Fix '--gui' whe
n
diff
.
guitool is
u
n
c
o
nf
i
gured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Ag
u
ilar
t7
8
00-di
f
ftool
.
s
h
: Test mergetool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguil
a
r
difftool: Update
c
opyright notic
e
s to
list e
a
c
h
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
diff
t
ool: Use eval to expand '--extcmd' exp
r
essio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
i
d
Aguilar
d
i
fftool:
A
d
d
'-x' and a
s
an alias for '--ex
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
u
ilar
t7800-diff
t
ool
.
sh:
S
imp
l
ify the --extcmd tes
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d A
g
uilar
gi
t
-
d
iff
.
t
xt: Link to
g
it-d
i
ff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
d
i
fftoo
l
: All
o
w
specify
i
n
g
un
c
onfigured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
diffto
o
l--helper: Remove
u
se of the GI
T
_
M
E
RGE_
T
O
OL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol-
-
h
e
lper: Update co
p
yright and remo
v
e distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
Aguil
a
r
git-difft
o
ol: Add '--gui' for s
e
le
c
t
i
ng a GUI
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
lar
t
7
800-diff
t
ool: S
e
t a bogus tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid
A
g
u
ilar
h
elp:
Do not
unnec
e
ssa
r
i
ly
l
ook fo
r
a r
e
pository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id
Aguila
r
subm
o
dule
.
c: Sq
u
elc
h
a "use before assig
n
men
t
" wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
d
i
ff: gene
r
ate pretty filen
a
me
s
in pre
p
_
temp
_
blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
compat: add a basename() compatib
i
lity funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Agu
i
lar
compat: add a
m
kstemps() compatib
i
l
i
ty functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
Add git-repla
c
e to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
a
vid Aguilar
merg
e
too
l
--li
b
: add support for araxis
me
r
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
v
id Aguilar
me
r
geto
o
l--lib
:
specialize diff options for emer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergeto
o
l--lib: simplif
y
API
u
sage by removing m
o
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool
/
mergetool: ref
a
c
tor co
m
man
d
s to use
git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merget
o
ol: use $(
.
.
.
)
i
n
s
tead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
bash complet
i
on: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difft
o
ol: add su
p
port for a difftoo
l
.
prompt confi
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
dif
f
tool: add various git-d
i
fftool
t
e
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: move '
g
i
t-
d
iffto
o
l' out
o
f contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
u
ilar
difftoo
l
:
a
d
d a
-
y
shortcut for --no-promp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
di
f
ftool
:
u
s
e perl bu
i
l
t
-ins when testing for ms
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: remov
e
the
backup file f
e
atu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool:
re
m
ove merge options for o
p
end
i
ff,
t
kdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguila
r
everyda
y
: use the dashless form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid
Aguil
a
r
contrib/difftool: use
a separate config na
m
espace
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d A
g
uil
a
r
contrib/difftool: Do
n
't repeat merg
e
tool candi
d
ates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool
:
put th
e
cursor on the editable file
for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
ifftool: fix documen
t
a
t
ion
p
rob
l
e
ms
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
guilar
contrib:
a
dd 'git
diffto
o
l'
for la
u
nching common mer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid
Agui
l
ar
git
-
merg
e
tool:
prop
e
r
l
y
h
andle "git mergetool -- file
n
ame"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguila
r
tests: add a testcase
f
or "
g
it s
u
bmo
d
ul
e
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David A
g
uilar
git
-
submodule: add "sync
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
i
d
Ag
u
ilar
git-su
b
module: replace duplicated c
o
de
with a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
id A
g
uilar
[PATCH]
g
itk: Don't show lo
c
al cha
n
ges when w
e
t
he
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree