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
mergetool--lib: add functions for finding available tools
2013-02-03
David Aguilar
mergeto
o
l
-
-
lib
:
add funct
i
ons
f
o
r finding
a
va
i
lable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
i
lar
mergetool
-
-lib:
i
m
p
rove t
h
e h
e
lp text in gu
e
ss_me
r
ge_tool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Agu
i
la
r
mergetool--lib
:
simplify command
express
i
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d A
g
uilar
mergetools: simplify how we handle "vim"
and "defaults"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
m
e
rgetool--lib: don
'
t c
a
ll "
e
xi
t
" i
n
setup_tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id
A
guila
r
mergetool--
l
ib
:
i
mprove
s
how_tool_help(
)
ou
t
pu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mer
g
e
t
ools/vim: re
m
ove redundan
t
di
f
f
command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-difftoo
l
:
u
se git-merg
e
tool--lib for "--tool-help"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-mergetool: don
'
t
ha
r
dcod
e
'
mergetool' in show_tool_help
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keepi
n
g
gi
t
-mergetool:
r
em
o
ve redund
a
nt a
s
signment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
getool: move
s
h
ow_tool_hel
p
to merget
o
ol--lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-21
Junio C Ham
a
no
Git 1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-17
Juni
o
C
Ham
a
no
Merge t
a
g 'gitgu
i
-0
.
17
.
0'
o
f git://repo
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2012-10-17
Junio C Haman
o
Git 1
.
8
.
0-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-17
Junio
C Hamano
Merge git://
g
ithub
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-10-17
Jun
i
o C Hamano
Sync wit
h
1
.
7
.
12
.
4
commit
|
commitdiff
|
tree
2012-10-17
J
u
n
io C Hamano
Git 1
.
7
.
1
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-17
Junio C H
a
mano
Merge bran
c
h '
j
k/maint-h
t
tp-half-a
u
t
h
-
push' int
o
main
t
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
M
e
rge bran
c
h
'rr/git
-
u
ri-doc' into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C
Hamano
Me
r
ge bra
n
ch
'
bw/cp-a-is-gnuism'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-10-17
Ju
n
io
C Hamano
M
erg
e
branch 'nd/doc-ignore' i
n
to maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Merge b
r
anch 'jc/doc-long-options' into m
a
int
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hama
n
o
Merg
e
branch 'jc/main
t
-t1450-fsck-order-fix' into
m
ain
t
commit
|
commitdiff
|
tree
2012-10-17
J
u
ni
o
C Ha
m
ano
Merge branch 'rr/test-use-
s
he
l
l-path-not-shel
l
' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Merge
branch 'rr/t
e
st-make-
s
ure-we-have-git' into
m
aint
commit
|
commitdiff
|
tree
2012-10-17
Junio C Ha
m
ano
Merge branch '
p
o/mai
n
t-docs' into main
t
commit
|
commitdiff
|
tree
2012-10-17
J
u
n
i
o
C
Hamano
Merg
e
b
r
a
nch 'jc/ll-me
r
ge-binary-ours' i
n
to maint
commit
|
commitdiff
|
tree
2012-10-17
J
u
nio C Hamano
Me
r
ge
b
r
a
n
ch 'd
b
/do
c
-
custom
-
xmlto' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-10-16
T
h
om
a
s Acke
r
m
a
n
n
D
ocumentatio
n
/RelNotes: remove "update
d
up to this
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-16
Junio C Hamano
Update draft re
l
ease notes to 1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-16
J
unio C Hamano
Merge branch 'jk/maint
-
http-
h
a
lf-a
u
th-push'
commit
|
commitdiff
|
tree
2012-10-14
J
u
nio C Hamano
Merge br
a
nc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2012-10-14
Richard Fearn
Fix spelli
n
g
e
rror i
n
post-receive
-
e
mail hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-12
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-10-12
Jeff
King
http: fi
x
segfault
i
n handle_curl_resu
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-12
Dyla
n
A
lex Sim
o
n
g
i
tweb
.
cgi: fix "comitte
r
_t
z
" typo in feed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-11
Junio C Hamano
Git 1
.
8
.
0
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-10
J
uni
o
C Hamano
Merge bran
c
h 'rr/git-
u
ri-doc'
commit
|
commitdiff
|
tree
2012-10-10
Jun
i
o
C Hamano
Merg
e
branch 'bw/cp-
a
-is
-
gnuism'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hamano
Merge bra
n
ch
'
nd/doc-ignore'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hamano
Merge bran
c
h 'jc/
d
oc-long-optio
n
s'
commit
|
commitdiff
|
tree
2012-10-10
Junio
C Hamano
Sync with
m
aint
commit
|
commitdiff
|
tree
2012-10-10
Ju
n
io
C Hamano
Merge g
i
t://bogomi
p
s
.
org/git
-
svn
commit
|
commitdiff
|
tree
2012-10-10
Ramsay Jones
MALL
O
C_CHEC
K
: Allo
w
c
h
ecking to be disabled from config
.
mak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-10
N
guyen Thai Ngoc Duy
attr: a note
abo
u
t
the order of
.
gitattribu
t
es lookup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-09
Junio C
H
amano
Merge
b
ranc
h
'm
a
int'
commit
|
commitdiff
|
tree
2012-10-09
Øyvind A
.
Holm
co
n
f
igure
.
ac: A
d
d
m
issing comma to CC_LD
_
DYN
P
ATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-09
Junio C Ha
m
ano
Merge branch
'
m
aint' of git://
g
ithub
.
c
om/git-l
1
0n/git
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Ben Wa
l
t
o
n
test
s
: "c
p
-a" is a GNUism
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-08
R
amkumar Ramachandra
Git
url doc: mark
f
t
p/ftps as read
-
only and
d
e
prec
a
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-08
Junio
C
H
ama
n
o
Git 1
.
8
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-08
Junio
C
Hamano
Merge branch '
j
c
/m
a
int
-
t
1450
-
fs
c
k-order-fix'
commit
|
commitdiff
|
tree
2012-10-08
J
unio C H
a
mano
Merge branch
'
jc/
m
erge-bases
-
p
a
int-fix'
commit
|
commitdiff
|
tree
2012-10-08
Junio C H
a
man
o
Sync
w
ith 1
.
7
.
12
.
3
commit
|
commitdiff
|
tree
2012-10-08
Jun
i
o C Ham
a
no
Gi
t
1
.
7
.
12
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-08
Junio C Ham
a
no
M
e
rge branch 'o
s
/
commit-su
b
module-i
g
nore' into maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C
H
am
a
no
Merge
br
a
nch 'jk/receive-pack
-
unpack-error-to-pusher
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Merge branch 'rt/maint-clone-si
n
gle' i
n
to maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Merge branch 'jc/
b
lame-f
o
llo
w
s-r
e
names'
i
nto maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Merge branch
'
lt/m
a
ili
n
fo-handle-a
t
tachment-more-sanely
.
.
.
commit
|
commitdiff
|
tree
2012-10-07
Ngu
y
ễ
n Th
á
i Ngọc Duy
gitignore
.
t
x
t
:
s
uggestio
n
s how to get
litera
l
#
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-05
Junio C
H
a
m
ano
gitcli: par
s
e-option
s
lets y
o
u omit
tail
o
f
l
ong o
p
tion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-04
Junio C H
a
mano
paint_dow
n
_to_
c
ommon(
)
: pa
r
se commit be
f
o
re re
l
ying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-03
Junio C Hamano
Up
d
ate draft re
l
ease n
o
tes to 1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-03
Junio C Ham
a
n
o
Merge branch
'
n
d/grep-reflog'
commit
|
commitdiff
|
tree
2012-10-03
Junio C Hamano
M
erge branch '
l
t/mailinfo-handle-att
a
chment-more-sanely'
commit
|
commitdiff
|
tree
2012-10-03
Junio C Haman
o
Merg
e
branch 'tu/gc-a
u
to-quiet'
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
t145
0
: the order t
h
e objects are chec
k
e
d
is undefi
n
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-02
J
u
nio C Hamano
M
er
g
e bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2012-10-02
Juni
o
C Hamano
Start pre
p
arin
g
f
or 1
.
7
.
12
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-02
J
unio C Hamano
Merge
br
a
nch 'rr/
m
a
in
t
-subm
o
dule
-
u
nknown-cmd' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
J
u
nio
C Ha
m
ano
Merge
b
ranch 'sp/mai
n
t-ht
t
p-
e
nable-gzip' into mai
n
t
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
M
er
g
e branch 'sp/main
t
-http-in
f
o
-
refs-no-retr
y
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Peter K
r
eftin
g
l10n: Fix to S
w
edish transla
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-02
Ramkumar Ramachandra
Documentation: mentio
n
`
p
ush
.
def
a
ult` in git-push
.
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
M
i
chael J Gruber
RelN
o
tes/1
.
8
.
0:
v
ari
o
us typo
a
nd style
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-01
Junio
C Haman
o
Gi
t
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/c
o
mple
t
ion-tests'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
Me
r
g
e
branch 'ep/malloc-
c
heck-perturb'
commit
|
commitdiff
|
tree
2012-10-01
Jun
i
o C
H
am
a
n
o
Merg
e
bran
c
h 'da
/
merget
o
ol-custom'
commit
|
commitdiff
|
tree
2012-10-01
Junio C H
a
mano
Merg
e
bra
n
c
h
'
o
s/commit-submodul
e
-ign
o
r
e
'
commit
|
commitdiff
|
tree
2012-10-01
Junio C H
a
ma
n
o
Merge branch
'
jc/
b
lame-follows-ren
a
m
e
s
'
commit
|
commitdiff
|
tree
2012-10-01
Junio C
H
amano
Me
r
ge branch 'jk/
r
eceive-pa
c
k-unpack
-
er
r
or
-
to
-
p
u
sh
e
r'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
M
erge
b
ranch
'rt/m
a
int-clone-single'
commit
|
commitdiff
|
tree
2012-10-01
Lin
u
s Torv
a
l
d
s
mailinfo: d
o
n't require "
t
e
x
t"
m
ime
t
ype for attachm
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-30
J
unio C H
a
m
a
n
o
Merge git:
/
/
g
i
thu
b
.
com/git-l10n/git-p
o
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
io C Hama
n
o
Up
d
ate
d
raft release
notes t
o
1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio C Hamano
S
ync with 1
.
7
.
12
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
G
i
t 1
.
7
.
12
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-30
J
u
ni
o
C Haman
o
Merge branch 'maint' of git://github
.
co
m
/
git-l1
0
n
/
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
i
o C Hamano
Merge bran
c
h 'jc/m
a
in
t
-log-grep-all-match-1'
i
n
to maint
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio C
Hamano
Merge
branch 'jc
/
maint-
m
ailinfo-m
i
me-attr' into maint
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio C Hamano
Merge
b
r
a
n
ch 'r
r
/maint-subm
o
d
u
le-unk
n
own-cm
d
'
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio C Hamano
Mer
g
e
br
a
nch 'rs/archive-zi
p
-u
t
f
8'
commit
|
commitdiff
|
tree
2012-09-30
Junio C H
a
man
o
Merge branch 'jk/smar
t
-http-swi
t
ch'
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
io C
H
amano
M
e
rge branch 'sp/mai
n
t-http-
e
nable-gzi
p
'
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
M
erge branch 's
p
/m
a
int-
h
ttp
-
in
f
o-refs-no-retry'
commit
|
commitdiff
|
tree
2012-09-30
J
u
n
i
o C Hama
n
o
Merge branch
'
aw/rebase-i-edit-todo'
commit
|
commitdiff
|
tree
2012-09-30
J
un
i
o
C
Hamano
Merge
b
ranch 'js/r
e
base
-
ex
e
c-command-not-foun
d
'
commit
|
commitdiff
|
tree
2012-09-30
Junio
C H
a
m
a
n
o
Merge branch '
r
r/test-
u
se-shell-p
a
t
h-not-shell'
commit
|
commitdiff
|
tree
next