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
Update draft release notes to 1.8.0
2012-09-25
D
a
v
id Agui
l
a
r
merg
e
tool--li
b
: Allow custom c
o
m
m
a
nds to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
av
i
d
Agui
l
a
r
gitk: Rename '
t
agcontent
s
'
to 'cached_ta
g
con
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Ag
u
ilar
g
i
tk: Teach "R
e
read refere
n
ce
s
" to r
e
load tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
merge
t
ool,difftool: Document --tool-help con
s
is
t
ently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
difft
o
ol: Disa
b
le --symlinks on
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
difftool: Handle
com
p
are() retu
r
ning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
d
i
fftoo
l
: Wrap long lines
for
r
eadability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool: Check all return
code
s
f
r
om comp
a
re()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Aguil
a
r
d
i
fftool: Handle finding mergetools/ in
a
path
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool
:
Use symlinks
w
hen diff
i
ng
a
ga
i
nst
t
he work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool: Call the
t
emp director
y
"git-difftool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Agu
i
lar
diff
t
ool: Move
o
ption value
s
i
n
t
o a has
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
A
g
uilar
di
f
ftool: Elimi
n
ate glob
a
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Simpl
i
fy print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
gu
i
lar
t780
0
:
Test difftool
p
assing
a
rguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
me
r
getoo
l
:
P
ro
v
ide an empty file
w
hen needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Aguilar
Mak
e
f
ile: Im
p
ro
v
e compil
e
r
hea
d
er dependency chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
A
guilar
me
r
g
e
t
ool
s
/mel
d
: Use '--output' when a
v
ailable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Ag
u
ilar
me
r
getool--
l
i
b
:
R
e
fa
c
tor too
l
s into
s
eparate f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
mergeto
o
l
--lib: M
a
ke style consis
t
ent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftoo
l
-
-
helper: M
a
ke style
co
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t75
0
3
-pre-c
o
mmit-hook
.
s
h
: Add GI
T
_P
R
EFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetoo
l
-
-lib: Make
vi
m
di
f
f ret
a
in the cu
r
ren
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid A
g
ui
l
ar
g
i
t
:
R
e
move ha
n
d
l
ing
f
o
r G
I
T_PREFI
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d Aguilar
setu
p
: Provide G
I
T
_
PR
E
F
IX to b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Ag
u
ilar
s
u
bmodule
s
y
n
c: Update
"
submodule
.
<
name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David A
g
uilar
me
r
getool:
Skip
au
t
o
r
esolve
d
pat
h
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
o
c
umentation:
Explain gi
t
-m
e
rge
t
o
o
l's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Agui
l
a
r
Makefile: Remove usa
g
e o
f
deprecated Pyt
h
on "has_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
Aguila
r
diffto
o
l: Fix '--gu
i
' whe
n
diff
.
g
u
itool is
u
n
c
onfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
Agu
i
la
r
t78
0
0-d
i
ffto
o
l
.
sh: Test
mer
g
e
too
l
.
prompt fallba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
Aguil
a
r
d
ifftool: Update copy
r
i
ght notices
t
o
l
i
s
t
each yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
difftool: Use eval to expand '--extc
m
d' expr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Agui
l
a
r
d
i
ff
t
ool: Add '-x' an
d
as an al
i
a
s for '--extcmd
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
Aguilar
t7800-dif
f
tool
.
sh: Simpli
f
y the
--extcmd tes
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d
Aguilar
git-d
i
f
f
.
tx
t
: Link t
o
git
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Aguilar
dif
f
t
o
ol: Allow speci
f
ying unconfigured c
o
mmand
s
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
a
r
d
i
fftool-
-
helper: Remove
use of the
G
IT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
difftool--
h
el
p
e
r
: Update copyrig
h
t and remove d
i
s
t
racting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-diff
t
o
o
l: Add '--gui' for sele
c
ting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
t78
0
0-
d
ifftool: Set a
b
ogus tool for us
e
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David
A
g
uil
a
r
help: Do not unnece
s
sarily look for a
reposi
t
or
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David A
g
u
i
l
a
r
submodule
.
c: Squelch a "
u
se
b
efore assi
g
nment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
d
i
ff
:
generate p
r
et
t
y
filena
m
es i
n
prep_temp_blob
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a basename() comp
a
tibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
comp
a
t: ad
d
a mkstemps()
c
o
mpati
b
ility
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add g
i
t-replac
e
to
.
gi
t
ignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d Aguilar
m
ergetool--lib
:
add su
p
port
for a
r
axis
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Aguilar
merget
o
ol--lib: specialize diff
optio
n
s for emerg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguilar
merget
o
ol-
-
lib: simplify API
us
a
ge by removing
m
o
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguil
a
r
difftool
/
mergetool: refactor commands to u
s
e git-m
e
rgetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
mergetool
:
use $(
.
.
.
)
instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d Aguilar
bash completion: add gi
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool:
a
dd
s
u
pp
o
rt
for
a
difftool
.
pr
o
mpt co
n
fig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
ifftool: a
d
d various git-
d
ifftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agui
l
ar
dif
f
t
o
ol: move
'
git-difftool'
out of
contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftoo
l
: a
d
d
a
-
y sh
o
rtcut for --no-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: use
p
e
rl built-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
f
t
ool:
remove the bac
k
up file feat
u
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool: remove merge options fo
r
ope
n
diff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David
A
gui
l
ar
e
v
eryday: use the dashless form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguilar
co
n
trib/di
f
f
tool:
use a
separate config namespac
e
f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguila
r
co
n
t
rib/difftool: Don'
t
repeat merge too
l
candida
t
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d
Aguil
a
r
difftool: put the cursor
o
n the edita
b
le file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
difftoo
l
:
fix docume
n
t
a
tion prob
l
e
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Dav
i
d
Aguilar
contrib:
add 'git diff
t
oo
l
' for launchi
n
g comm
o
n merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguil
a
r
gi
t
-me
r
g
e
tool: p
r
op
e
rly handle "git mergetool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avid Aguilar
tests:
a
d
d
a
t
estcase for "git su
b
m
o
dule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
git
-
submod
u
le: add
"sync" com
m
a
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Aguil
a
r
git-
s
ubmodule: r
e
place dup
l
icate
d
code
w
i
t
h
a mod
u
le_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
id
A
guilar
[
PATCH]
gitk: Don
'
t show
local
c
hanges wh
e
n w
e
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree