repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool--lib: add functions for finding available tools
2013-02-03
David A
g
ui
l
ar
mergeto
o
l--lib:
a
dd function
s
for finding
a
v
ailable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
mergetool--lib: imp
r
ove the he
l
p tex
t
in gue
s
s_mer
g
e
_
tool()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Ag
u
ila
r
mergetool--lib: simplify comma
n
d exp
r
essi
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
merg
e
tools: simplify h
o
w we handle "vim"
and "default
s
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Kee
p
ing
mergetool
-
-
l
ib: don't call "
e
xit" i
n
setup_tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetool--l
i
b: impro
v
e
show_
t
ool_hel
p
() output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
mergetools/vim: remove redundant diff command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-di
f
ftool: use
git
-
m
e
rgetool--lib
for "--tool-help"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-merg
e
tool: don't
hard
c
ode 'merget
o
ol' in show_tool_help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-me
r
ge
t
ool: remove r
e
dundant
a
s
si
g
nment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-mergetool:
m
ove show_tool_
h
elp t
o
mergetool--lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-21
Jun
i
o C Haman
o
Git
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-17
J
unio C H
a
mano
Merge tag 'gitgui
-
0
.
1
7
.
0
' of git://rep
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2012-10-17
Juni
o
C
H
ama
n
o
Git 1
.
8
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Merge git://git
h
ub
.
com/
g
it-l
1
0
n
/git-po
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Sync
w
ith 1
.
7
.
12
.
4
commit
|
commitdiff
|
tree
2012-10-17
Junio C Ham
a
no
Git 1
.
7
.
12
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-17
Junio C
H
amano
Merge branch 'jk/maint-h
t
tp-half-auth
-
p
u
sh' i
n
to main
t
commit
|
commitdiff
|
tree
2012-10-17
Junio
C Haman
o
Mer
g
e branc
h
'r
r
/git-uri-
d
oc' into mai
n
t
commit
|
commitdiff
|
tree
2012-10-17
J
u
n
i
o C Hama
n
o
Merge
branch
'
bw/cp-a-is-gnuism' in
t
o maint
commit
|
commitdiff
|
tree
2012-10-17
Ju
n
io C
H
ama
n
o
Merge branch 'nd/doc-ignore' into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hama
n
o
Merg
e
branch '
j
c/d
o
c-long-o
p
tions' i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2012-10-17
Ju
n
io C Hamano
Me
r
g
e
b
r
a
nc
h
'j
c
/maint-t1
4
50-fsc
k
-
o
rder-fi
x
' int
o
maint
commit
|
commitdiff
|
tree
2012-10-17
Junio
C
Hamano
M
e
rge branch 'rr/test-use-shell-path-not-shel
l
' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-17
Junio C H
a
mano
Merge bra
n
ch 'rr/test-
m
ake-sure-we-have-
g
it' into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Mer
g
e branch 'po/maint-docs' into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Merge bra
n
ch 'jc/ll
-
m
erge-binary
-
ours' int
o
m
a
in
t
commit
|
commitdiff
|
tree
2012-10-17
Junio C Ham
a
no
M
e
rge br
a
nch 'db/do
c
-custom-
x
ml
t
o' int
o
main
t
commit
|
commitdiff
|
tree
2012-10-16
T
homas A
c
kermann
Documentation/RelN
o
tes: remove
"
updat
e
d up to t
h
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-16
Ju
n
io C Hama
n
o
Up
d
ate dra
f
t release notes
t
o 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-16
Junio
C
Ha
m
a
n
o
Merge br
a
nch
'
jk/mai
n
t
-http-half-auth-push'
commit
|
commitdiff
|
tree
2012-10-14
Junio C H
a
m
a
no
M
erge
bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2012-10-14
Richar
d
Fearn
Fix spellin
g
e
r
ror in post-r
e
ceive-
e
mail hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-12
Junio C Hamano
M
e
r
ge branch
'm
a
int'
commit
|
commitdiff
|
tree
2012-10-12
Jeff King
http: f
i
x s
e
gfault in
h
andl
e
_cur
l
_result
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-12
Dy
l
a
n
A
l
e
x
S
imon
git
w
eb
.
c
g
i: fix
"
comitter_tz" typo in
feed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-11
Juni
o
C Hama
n
o
Git 1
.
8
.
0-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-10
Junio C H
a
mano
Merge br
a
n
ch
'rr/git-
u
ri-doc'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hama
n
o
Merge
b
r
a
nch 'bw/cp-a-is-gnui
s
m'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Ham
a
no
M
erge
b
ranch 'nd/doc-ignore'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hamano
Merge branch
'
jc/doc-
l
ong-options'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hamano
Sync with ma
i
nt
commit
|
commitdiff
|
tree
2012-10-10
Junio C Ha
m
ano
M
erge g
i
t
://bog
o
mips
.
o
r
g
/
git-svn
commit
|
commitdiff
|
tree
2012-10-10
Ramsay Jones
MALLO
C
_
C
H
ECK: Allow chec
k
ing t
o
be disabled from config
.
mak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-10
Ngu
y
en Thai Ng
o
c Du
y
attr
:
a note about the
o
rder
of
.
gitattributes lookup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-09
Junio C Haman
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2012-10-09
Øyvind A
.
Holm
configur
e
.
ac: Add missing comma to CC_LD_
D
YNPATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-09
Junio C Hamano
Merge b
r
anch 'maint' of
g
it://githu
b
.
com
/
g
i
t-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Ben W
a
lton
t
e
sts: "
c
p -a" is a
G
N
U
i
sm
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Ramkumar
Ramachandra
Git url d
o
c
: mar
k
ftp/ftps as read-o
n
l
y
a
nd deprecate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
J
u
nio C Hamano
Gi
t
1
.
8
.
0-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Junio C
Hamano
Merge branch 'jc/maint-t14
5
0-fsc
k
-order-fix'
commit
|
commitdiff
|
tree
2012-10-08
Jun
i
o
C Hamano
Mer
g
e branch 'jc/merg
e
-bases-paint-fix'
commit
|
commitdiff
|
tree
2012-10-08
J
u
nio
C
Hamano
Sync wit
h
1
.
7
.
12
.
3
commit
|
commitdiff
|
tree
2012-10-08
Juni
o
C
Ha
m
ano
Git 1
.
7
.
12
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Junio C
Ha
m
ano
Merge bra
n
ch 'os/co
m
mit-submodule-ignore' into m
a
int
commit
|
commitdiff
|
tree
2012-10-08
Junio C H
a
mano
Merge br
a
nch 'jk
/
receive-pack-un
p
ack-err
o
r
-
to-pusher
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Ju
n
io
C
Ha
m
ano
M
e
rge branch 'rt
/
maint-c
l
one
-
sin
g
l
e
' i
n
to maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Merge
b
ran
c
h 'jc/blame-fol
l
ows-renames' int
o
main
t
commit
|
commitdiff
|
tree
2012-10-08
Junio
C
Hamano
Merge b
r
anch
'
lt
/
mailin
f
o-handl
e
-attachm
e
nt-more-sanel
y
.
.
.
commit
|
commitdiff
|
tree
2012-10-07
Nguy
ễ
n Thái
N
gọc
D
uy
g
i
tig
n
ore
.
tx
t
: sugg
e
s
t
ions how
to ge
t
l
i
teral # or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-05
Juni
o
C Ha
m
ano
gitcli:
p
arse-options lets
you omit tail of long
o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-04
Ju
n
io C H
a
mano
paint_down
_
to_co
m
mon(): p
a
rse
c
om
m
it before rel
y
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-03
J
u
nio C Hamano
Upda
t
e dr
a
ft release notes t
o
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-03
Jun
i
o
C
H
aman
o
Merge
br
a
nch 'nd/grep-reflog'
commit
|
commitdiff
|
tree
2012-10-03
Ju
n
io C Hamano
Merge branch
'lt/mailinfo-
h
andle-
a
ttachment-
m
ore-s
a
nely'
commit
|
commitdiff
|
tree
2012-10-03
Ju
n
i
o
C Hamano
Merge branch
'tu/gc-auto-quiet'
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
t1450: t
h
e order th
e
obje
c
t
s are
c
hecked is undefined
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Junio
C
Hamano
M
e
r
g
e branc
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
Start p
r
e
paring f
o
r 1
.
7
.
12
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
M
e
r
ge
b
r
an
c
h 'rr/maint-submodule-un
k
no
w
n-c
m
d' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Ju
n
i
o
C Hamano
Merge branch 'sp/mai
n
t-h
t
tp-enabl
e
-gzi
p
' into maint
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
M
e
r
g
e
branch 'sp/maint-htt
p
-
i
nfo-re
f
s-no-retry' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Peter
K
r
e
ft
i
n
g
l10n: Fix to Swedish
t
ranslation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
R
a
mkumar
Ram
a
chandr
a
D
ocument
a
tion: mention `pu
s
h
.
def
a
ult` in git-
p
ush
.
tx
t
Fixed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Michael J Gruber
R
elNotes
/
1
.
8
.
0: va
r
ious
t
ypo and style fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
Git 1
.
8
.
0-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
Merge branch 'jk
/
co
m
ple
t
ion-tests'
commit
|
commitdiff
|
tree
2012-10-01
Ju
n
io C Hamano
M
erge
branch 'ep/m
a
lloc-check-perturb'
commit
|
commitdiff
|
tree
2012-10-01
Junio
C
H
amano
Merg
e
branch 'da
/
merge
t
ool-custom'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Ha
m
an
o
Merge b
r
anch 'os
/
commit-submodule-ignore'
commit
|
commitdiff
|
tree
2012-10-01
Jun
i
o C Hamano
Merge branc
h
'jc/bla
m
e-follows-renames'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
Merge branch
'
j
k
/recei
v
e-pack-
u
npack
-
error-t
o
-pusher'
commit
|
commitdiff
|
tree
2012-10-01
J
unio
C
H
a
mano
Merge b
r
a
nch 'rt/m
a
int-
c
lone-
s
ingle'
commit
|
commitdiff
|
tree
2012-10-01
Linus
T
o
rvalds
mai
l
info:
d
on't require "text" mime type
f
or attach
m
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
io C Ha
m
a
n
o
Merge git://gith
u
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
io C Haman
o
Updat
e
draft r
e
lease notes t
o
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
i
o
C H
a
mano
Sync with 1
.
7
.
1
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
Junio
C
H
a
m
a
no
Git
1
.
7
.
12
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Mer
g
e
b
ra
n
ch 'main
t
' of
g
i
t://githu
b
.
c
om
/
gi
t
-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Junio C Ha
m
ano
Merge
b
r
a
n
ch 'j
c
/maint-log-
g
rep-a
l
l-
m
atch-1' into maint
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
io C Hamano
Merge br
a
nc
h
'jc/maint-mailinfo-mime-attr' int
o
main
t
commit
|
commitdiff
|
tree
2012-09-30
J
unio C H
a
m
a
no
M
erge branch
'rr/maint-submodu
l
e
-
unknow
n
-cmd'
commit
|
commitdiff
|
tree
2012-09-30
Jun
i
o C Hamano
Merge branch 'rs/archive-zip-utf8
'
commit
|
commitdiff
|
tree
2012-09-30
Junio
C Hamano
Merge branch 'jk/
s
mart-htt
p
-switch'
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio C Hamano
Merge branch 'sp/maint-h
t
tp
-
enable-gzip'
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
io C
H
amano
Merge branch
's
p
/maint-ht
t
p-info-ref
s
-no-retr
y
'
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio C Ha
m
ano
Merge branch 'a
w
/
rebase-
i
-
edit-to
d
o'
commit
|
commitdiff
|
tree
2012-09-30
Junio C
H
amano
Merg
e
b
r
a
nch 'j
s
/reb
a
se-exec-co
m
mand-not
-
foun
d
'
commit
|
commitdiff
|
tree
2012-09-30
Juni
o
C
H
amano
Merge branch 'rr
/
test-use-shell-
p
ath-not-shell'
commit
|
commitdiff
|
tree
next