repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
doc: generate a list of valid merge tools
2013-02-03
David
A
g
u
i
l
a
r
do
c
: generate a list o
f
va
l
id mer
g
e tools
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
merget
o
ol-
-
lib: l
i
st user
configured tools i
n
'--tool
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Agu
i
lar
me
r
geto
o
l--
l
ib:
add functions for finding availa
b
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
a
r
me
r
g
etoo
l
--lib:
i
mpr
o
ve
t
h
e help tex
t
in g
u
ess_merge_tool()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merg
e
to
o
l--lib: simpl
i
f
y
command expressions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
gui
l
ar
mergetools:
sim
p
lify how we handle "vi
m
"
and "def
a
ults"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
mergetool-
-
lib: don't call
"exi
t
" in
setu
p
_tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
mergetool--lib:
i
mprov
e
show_tool_
h
elp() output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim
:
remove redundant diff com
m
and
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Kee
p
ing
git-diffto
o
l: use git-mergeto
o
l--lib
for "--tool-help"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merg
e
tool:
don
'
t
hardcod
e
'mer
g
e
t
ool' in show_tool_help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
mergetool:
r
e
move redundant assig
n
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepin
g
git
-
mergetool: move show_tool_help to me
r
getool
-
-
lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-21
Juni
o
C
Hamano
Git
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Merge tag 'gitgui-0
.
17
.
0' of
git://repo
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Git 1
.
8
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-17
Junio C Haman
o
Merge g
i
t://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Sync with 1
.
7
.
12
.
4
commit
|
commitdiff
|
tree
2012-10-17
Jun
i
o C
H
am
a
no
G
i
t
1
.
7
.
12
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-17
Junio C Ha
m
ano
M
erge branch 'jk/maint-http-h
a
l
f
-
a
uth-pus
h
' in
t
o maint
commit
|
commitdiff
|
tree
2012-10-17
Junio
C
Hamano
Merge branch 'rr/git-uri-doc' in
t
o main
t
commit
|
commitdiff
|
tree
2012-10-17
J
u
n
io C Haman
o
Merge branch 'bw/cp-a
-
is-gnuism' into ma
i
nt
commit
|
commitdiff
|
tree
2012-10-17
Junio C H
a
mano
Merg
e
br
a
n
ch '
n
d
/
doc-
i
gno
r
e' in
t
o maint
commit
|
commitdiff
|
tree
2012-10-17
Juni
o
C Hamano
Mer
g
e b
r
a
n
ch 'j
c
/doc-long-options' into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C
H
amano
Mer
g
e branch
'
jc/maint-t1450-fsck-order-fix
'
into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio
C
Ha
m
a
no
Merge b
r
anch 'rr/
t
est-use-shell-path-not-shell' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-17
J
unio C
H
a
mano
Merge branch 'r
r
/test
-
m
ake-sure-we-have-git' into maint
commit
|
commitdiff
|
tree
2012-10-17
J
u
nio C Hamano
Merge branch 'po/ma
i
n
t
-
d
o
c
s
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-10-17
J
unio
C Hamano
Merge bran
c
h
'
jc/ll-merg
e
-
binary-ou
r
s'
into
maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C Ham
a
no
Merge branch 'db/doc
-
cus
t
om-xml
t
o' into ma
i
nt
commit
|
commitdiff
|
tree
2012-10-16
Thomas A
c
ker
m
ann
D
ocumenta
t
ion/RelNotes: remo
v
e
"
updated
u
p to this
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-16
Junio C Hama
n
o
Upda
t
e
dr
a
ft release no
t
es
t
o
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-16
J
un
i
o C Hamano
Merge branch
'
j
k
/
maint-htt
p
-half
-
auth-pus
h
'
commit
|
commitdiff
|
tree
2012-10-14
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2012-10-14
Richard Fearn
F
i
x spelling error
i
n
post-rece
i
ve-e
m
ail hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-12
J
un
i
o C Hamano
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2012-10-12
Jeff K
i
ng
http: fix segfault in h
a
ndle_curl_result
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-12
Dylan Alex Simon
g
i
tweb
.
cgi: fix "
c
omitter_tz" 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
Junio C Hamano
Merge
branch 'rr/git-uri-d
o
c'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hama
n
o
Mer
g
e branch 'bw/cp-a
-
is-gnuism'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hamano
Mer
g
e br
a
nch 'nd/doc-ignore
'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hama
n
o
M
e
rge b
r
anch 'jc/d
o
c
-
long-options'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hamano
Sync with main
t
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hamano
Me
r
g
e
g
it:
/
/bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-10-10
Ramsay Jones
MALLOC_CHEC
K
: Allo
w
chec
k
i
ng to be disabled from
c
on
f
ig
.
ma
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-10
Ng
u
y
en Tha
i
Ngoc Duy
att
r
: a note about th
e
order of
.
g
i
tattributes loo
k
up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-09
Juni
o
C Hamano
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2012-10-09
Øy
v
i
nd A
.
Holm
co
n
figur
e
.
ac: Add
missin
g
c
o
mma to
C
C_
L
D_DYNPATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-09
Junio C Hamano
Me
r
ge b
r
anch 'maint
'
of
g
it://github
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Ben Walton
tests
:
"
cp -a" is a
GN
U
i
sm
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Ramkumar Ramacha
n
dra
G
i
t u
r
l do
c
: mark ftp/f
t
ps as r
e
ad-only and de
p
recat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
J
unio
C
Ham
a
no
Git 1
.
8
.
0-r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Junio C
Hama
n
o
Merge branch
'
jc
/
maint-t1450-fsck-order
-
fix'
commit
|
commitdiff
|
tree
2012-10-08
Ju
n
io C H
a
mano
Mer
g
e branch
'
jc/merge-bas
e
s-
p
aint-f
i
x'
commit
|
commitdiff
|
tree
2012-10-08
Junio C
H
amano
Sy
n
c w
i
th 1
.
7
.
12
.
3
commit
|
commitdiff
|
tree
2012-10-08
J
unio
C
H
amano
Gi
t
1
.
7
.
12
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Merge
b
ranch '
o
s/commit-
s
ubmo
d
u
le
-
ignore
'
into maint
commit
|
commitdiff
|
tree
2012-10-08
Juni
o
C Hamano
Merge branch 'jk/receive-pack-unpa
c
k-e
r
ror-to-pu
s
h
er
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Jun
i
o C Hamano
M
e
rge branch 'rt
/
maint-clone-singl
e
' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Merge
branch 'jc/blame-follows-renames
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C Haman
o
Merge branch
'
lt
/
mailinfo-
h
and
l
e-attachment-mor
e
-san
e
ly
.
.
.
commit
|
commitdiff
|
tree
2012-10-07
Nguy
ễ
n Thái Ngọc Duy
giti
g
n
ore
.
txt: suggest
i
ons how to
get literal
#
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-05
Jun
i
o C Hamano
gitcli: pa
r
s
e
-options lets yo
u
omit tail
of long op
t
ion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-04
Jun
i
o C Hamano
paint_down_to_common(): parse commit be
f
o
r
e
rely
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-03
Ju
n
io C Ha
m
ano
U
p
date draft relea
s
e not
e
s to 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-03
Junio
C
Hamano
Merge branch 'nd/grep-reflog'
commit
|
commitdiff
|
tree
2012-10-03
Junio C Hamano
Me
r
ge branch 'lt/mailinfo-handle-attachment-more-sane
l
y'
commit
|
commitdiff
|
tree
2012-10-03
Junio C Hamano
Merge bra
n
ch
'
tu/
g
c-auto
-
qui
e
t
'
commit
|
commitdiff
|
tree
2012-10-02
Junio
C
H
a
mano
t145
0
: t
h
e
order the
o
bjects
a
r
e
c
h
ecked is undefine
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Junio C Ha
m
ano
Merge
branch
'
maint
'
commit
|
commitdiff
|
tree
2012-10-02
Junio C H
a
mano
S
t
art preparing for
1
.
7
.
12
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Jun
i
o C Hamano
Merge
bran
c
h
'
rr/maint
-
submodule
-
unkno
w
n-cmd'
into
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Ju
n
io C Hamano
Merge bra
n
ch 'sp/maint-h
t
t
p
-enable-gzip' into main
t
commit
|
commitdiff
|
tree
2012-10-02
Jun
i
o C Hamano
Me
r
g
e
b
r
anch 'sp
/
maint-
h
ttp-info-refs-no-retry'
into
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Pet
e
r
K
refting
l10
n
:
F
ix to Swedis
h
t
r
a
nslat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Ramkumar Ramac
h
a
n
d
r
a
Docume
n
ta
t
ion:
me
n
tion `push
.
default` in git-pu
s
h
.
t
xt
Fixed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Michae
l
J
Gruber
RelNotes/
1
.
8
.
0: various typo a
n
d style f
i
xes
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/completion-tes
t
s'
commit
|
commitdiff
|
tree
2012-10-01
Junio C
H
amano
Merge branch 'ep/malloc-check-perturb
'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
Merge branch 'da/mergetool-custom'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Ha
m
ano
M
er
g
e
b
r
anch 'os
/
c
o
mmit-submodule-ignore'
commit
|
commitdiff
|
tree
2012-10-01
J
u
nio C Hamano
Merge
b
r
anch
'jc/bla
m
e
-
fol
l
ows-rename
s
'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Ha
m
a
n
o
Merge
branch 'jk/receive-p
a
ck-u
n
pack-error-to-p
u
s
h
er'
commit
|
commitdiff
|
tree
2012-10-01
Junio C
Hamano
Merge branch 'rt/maint-clone-single
'
commit
|
commitdiff
|
tree
2012-10-01
Linus Torvalds
maili
n
f
o
: don't require "
t
e
x
t" mime type for attachments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
J
unio C
Hamano
Merge git://github
.
c
o
m
/git-l10n/git-
p
o
commit
|
commitdiff
|
tree
2012-09-30
Junio C Ham
a
no
Upd
a
te draft release notes to
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
Junio C Ham
a
no
S
ync wi
t
h 1
.
7
.
12
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio C Hamano
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
r
anch
'm
a
int'
o
f git://git
h
ub
.
com/git-l1
0
n/git
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merge branc
h
'
jc/maint-log-gre
p
-all-
m
atch-
1
' into maint
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merg
e
br
a
n
ch
'
j
c/maint-mailinfo-mime-attr' into
main
t
commit
|
commitdiff
|
tree
2012-09-30
J
u
n
i
o C Ham
a
n
o
Mer
g
e
branch 'rr/maint-submodule-unknown-cmd'
commit
|
commitdiff
|
tree
2012-09-30
Jun
i
o C
H
amano
Mer
g
e bra
n
ch 'r
s
/arc
h
ive-zip-
u
t
f8'
commit
|
commitdiff
|
tree
2012-09-30
Junio
C
H
ama
n
o
Merge branch 'jk/smart-
h
ttp-swi
t
ch'
commit
|
commitdiff
|
tree
2012-09-30
Junio C Ha
m
ano
Mer
g
e
branch 's
p
/maint-http
-
enabl
e
-gzi
p
'
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio C Hamano
Merge branch 'sp/mai
n
t
-
http-info-re
f
s-no
-
r
etry'
commit
|
commitdiff
|
tree
2012-09-30
Junio
C
Hamano
Merge
branch 'aw/rebase-i-edit-t
o
d
o'
commit
|
commitdiff
|
tree
next