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
Merge branch 'mz/cherry-pick-cmdline-order' into maint
2012-09-09
Davi
d
Agu
i
lar
gitk: Rename 'tagcon
t
en
t
s' to 'cached_
t
agcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
gitk: T
e
ach "Re
r
ead references" to reload
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
7800
:
Tes
t
di
f
f
t
ool pa
s
sing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
Aguilar
mergetool: Provide
an empt
y
fil
e
w
h
en
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguila
r
M
akefil
e
: Improve compiler header depende
n
c
y
check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Ag
u
i
la
r
me
r
getools/meld:
U
se '--out
p
ut'
when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avi
d
Agui
l
ar
mergetool--lib
:
R
efactor tools
i
nto separate f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
mergetool--
l
i
b
: Make style consistent
w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
diff
t
o
ol-
-
he
l
per: Make style consi
s
tent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
a
vid
A
gui
l
ar
t/t
7
503
-
pre-commit-hook
.
s
h: Add GIT_P
R
E
FIX
test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
a
r
g
i
t-me
r
getoo
l
--lib: Make vimd
i
ff
r
etain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
git
:
Remov
e
handling
f
o
r
GIT
_
PREFI
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
A
g
u
ilar
se
t
up: Provide G
I
T_PR
E
FIX to bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Ag
u
i
l
ar
s
u
bm
o
d
u
l
e
s
ync: U
p
da
t
e "s
u
bmo
d
ule
.
<nam
e
>
.
u
r
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Ag
u
ilar
mergetool:
S
kip autores
o
lved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
guilar
Documentati
o
n: Explain git-me
r
getool's use of
t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Aguilar
Makefile: Remove us
a
ge
of deprecate
d
Py
t
hon
"
ha
s
_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
avid
A
guilar
difftool: Fix '--gui
'
when d
i
ff
.
g
u
ito
o
l is un
c
onfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d
Aguilar
t7800-diff
t
ool
.
sh: Test mergetool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
v
id Ag
u
ilar
difftoo
l
: Up
d
ate c
o
pyright notices t
o
list each
y
e
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Agui
l
ar
d
i
ffto
o
l
:
U
s
e eval to expand '--extcmd' e
x
pr
e
s
s
ions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
dif
f
tool: A
d
d
'
-x' and as an
alias for '
-
-ext
c
md'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
A
g
u
il
a
r
t7800-diffto
o
l
.
sh
:
Simplify the --extcmd
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
git-d
i
ff
.
txt: Link to gi
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Agu
i
lar
difftool: Allow specifyin
g
unco
n
figured comman
d
s wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftoo
l
-
-h
e
lper: Remove use
o
f the G
I
T_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
dif
f
tool--helper: Update
c
o
pyright and remo
v
e distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
u
ilar
git-difftool: Add
'
--gui'
f
or selecting a GUI to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t
7
8
00-difftool: Set a bogus tool fo
r
use
by t
e
st
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
e
l
p: D
o
not unn
e
c
essarily look for a
reposit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelc
h
a "us
e
b
efore assignmen
t
" warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uil
a
r
diff: generate pre
t
ty filen
a
m
es in pre
p
_temp_blo
b
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d A
g
uilar
compat: add a bas
e
name() compat
i
b
i
l
ity f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
u
ilar
compat:
add a
m
k
stemps() com
p
atibility fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
git-rep
l
ace to
.
gitignor
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
Aguilar
me
r
getoo
l
--lib: add s
u
p
port for araxis
m
e
rge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
me
r
g
etoo
l
--lib: specia
l
i
ze
d
iff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid
Aguilar
merg
e
tool
-
-
l
ib: simplify API
u
sage by removing mor
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
ar
d
i
fftool/mergetool: r
e
facto
r
commands to use git-m
e
rgetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool: u
s
e $(
.
.
.
) instead of `
b
acktic
k
s`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion: add git-di
f
ftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add support for a diff
t
ool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
ui
l
ar
dif
f
tool:
a
dd various gi
t
-di
f
ftool tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
difftool: move 'git-d
i
f
ftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
ffto
o
l:
add a -y short
c
ut
f
or --no-
p
rompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Agu
i
lar
d
i
f
f
tool: us
e
pe
r
l built-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol:
remove the backup file featu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: remo
v
e
me
r
ge options for opendiff, tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id
Agu
i
lar
everyday
:
us
e
t
he d
a
sh
l
ess form
o
f git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id
A
guilar
contrib/di
f
ftool: us
e
a s
e
parate config namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/d
i
ffto
o
l: Don't repeat merge
t
ool c
a
ndidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difft
o
o
l
:
put the cu
r
sor on the
editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
i
lar
difftool: fix do
c
um
e
ntati
o
n problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
guilar
con
t
rib: add 'git difft
o
ol' for
lau
n
chin
g
common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguila
r
git-mergetool: pro
p
erly handle "gi
t
mergetool --
fi
l
ename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Ag
u
i
l
ar
t
ests: a
d
d a tes
t
c
ase
f
o
r
"git submodul
e
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguila
r
git-subm
o
dule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
lar
git-submodule: replace duplicated code with a m
o
dule_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguil
a
r
[P
A
TCH] gitk:
D
on't show loca
l
changes when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree