repo.or.cz
/
alt-git.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
u
ilar
m
e
rg
e
tool--lib: add f
u
n
c
tio
n
s for finding available
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib:
imp
r
ove the
hel
p
text i
n
guess
_
merge_t
o
ol()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id
Aguilar
mergetool--lib: simpli
f
y command e
x
pressio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
m
er
g
etools:
s
implify how we h
a
nd
l
e
"vim" and "defaults"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
m
e
r
g
etool-
-
lib: don't call
"
ex
i
t"
i
n setup_to
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
A
g
uilar
mer
g
etool--
l
ib: improve s
h
o
w_tool_hel
p
() o
u
tput
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
m
ergetools/vim
:
re
m
ove re
d
unda
n
t diff comman
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-difftool:
use git
-
mergetool--li
b
for
"--tool-help"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool: don't hard
c
od
e
'
m
erge
t
o
ol' in show_tool_help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-mergetool
:
remove red
u
ndant assign
m
en
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool
:
move show_tool_help
t
o mer
g
etool--lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-21
Junio C
Haman
o
Git 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Merge tag 'g
i
tgu
i
-0
.
17
.
0'
of git:/
/
r
epo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2012-10-17
Junio C Ha
m
ano
Git 1
.
8
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-17
Junio
C Hamano
M
e
r
ge git://github
.
com/gi
t
-l10n
/
git-po
commit
|
commitdiff
|
tree
2012-10-17
Jun
i
o C
H
amano
Sync with
1
.
7
.
12
.
4
commit
|
commitdiff
|
tree
2012-10-17
Jun
i
o C Hamano
G
it 1
.
7
.
1
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-17
J
unio C Ham
a
no
Merge branch 'jk/maint-http-half-auth
-
push' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-10-17
Juni
o
C Hamano
Merge
b
r
a
n
c
h 'rr/git-u
r
i-doc' into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C
H
aman
o
Merge branch
'b
w
/cp-a-is-gnuism' into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hama
n
o
Mer
g
e
branch
'
n
d/doc
-
ignore' into
maint
commit
|
commitdiff
|
tree
2012-10-17
Junio
C
Hamano
M
er
g
e
b
r
a
nch 'jc
/
doc-long-o
p
tions'
into maint
commit
|
commitdiff
|
tree
2012-10-17
J
u
nio C Hamano
Merge bra
n
ch '
j
c/maint-t1
4
50-fsck-order-fi
x
'
i
nto maint
commit
|
commitdiff
|
tree
2012-10-17
J
unio C Hamano
Merge branch 'rr/tes
t
-use-shell-path
-
not-shell
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-10-17
Juni
o
C
Hamano
Mer
g
e branch 'rr/test-make-sur
e
-we-
h
ave-git' into maint
commit
|
commitdiff
|
tree
2012-10-17
J
u
ni
o
C Hama
n
o
M
e
r
ge branch 'po/maint-docs'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2012-10-17
J
unio C Hamano
Merge branc
h
'jc/ll-merge-binary
-
ours'
into maint
commit
|
commitdiff
|
tree
2012-10-17
Juni
o
C Hamano
Merge branch 'db/do
c
-custom-xmlto' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-10-16
Thomas
A
ckermann
Documentati
o
n/RelNotes: remove "upd
a
ted up to this
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-16
J
unio C
Hamano
Update draft release notes to
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-16
Junio C H
a
mano
Merge branch 'jk/ma
i
n
t
-http-ha
l
f-auth-pus
h
'
commit
|
commitdiff
|
tree
2012-10-14
Juni
o
C Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2012-10-14
R
ichard F
e
arn
Fix spelling error in post-receive-email
h
o
ok
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-12
J
unio C Ham
a
no
Merge bra
n
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2012-10-12
Jeff King
http: fix segfault in han
d
le_curl_result
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-12
D
y
la
n
Al
e
x Simon
gitweb
.
cg
i
: fix "comitter_tz
"
ty
p
o in
f
eed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-11
J
u
nio C
Hamano
Git 1
.
8
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-10
Junio C Ha
m
ano
Mer
g
e
branch 'rr/gi
t
-uri-doc'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Hamano
Merge br
a
nc
h
'bw
/
cp-a-
i
s-gnuism'
commit
|
commitdiff
|
tree
2012-10-10
Junio C Ham
a
no
Merge bran
c
h 'nd/doc
-
ig
n
ore'
commit
|
commitdiff
|
tree
2012-10-10
J
unio C H
a
man
o
Merge branch 'j
c
/
d
oc-long-optio
n
s'
commit
|
commitdiff
|
tree
2012-10-10
Junio C H
a
mano
Sync with maint
commit
|
commitdiff
|
tree
2012-10-10
Junio C
Hamano
M
e
rge git:/
/
bo
g
omips
.
o
r
g
/git-
s
vn
commit
|
commitdiff
|
tree
2012-10-10
Ramsay Jo
n
es
M
A
L
L
OC_CHECK: Allow checking to be disabled from config
.
mak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-10
Nguyen Thai Ng
o
c Duy
at
t
r: a note about
t
h
e or
d
er of
.
gitattribute
s
lookup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-09
J
u
nio C H
a
mano
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2012-10-09
Ø
yvind A
.
Holm
c
o
nfigure
.
ac:
A
dd missing co
m
ma to CC_LD_DYNPATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-09
Junio C
H
a
mano
Me
r
ge bran
c
h
'maint'
of git:/
/
git
h
ub
.
com/
g
it-l1
0
n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Ben Walton
tests: "cp -a"
is a G
N
U
i
s
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Ramkuma
r
Ramachandra
Git url doc: m
a
rk ftp/ftps as
read-only and de
p
recate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Junio
C
Hamano
Gi
t
1
.
8
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Jun
i
o
C Ham
a
no
M
erge branch 'j
c
/maint-t
1
450-fsck-order-
f
ix'
commit
|
commitdiff
|
tree
2012-10-08
Junio C H
a
man
o
Merge bran
c
h 'jc/merge-bases-pain
t
-fix'
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Sync wi
t
h 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 Hamano
Merge bran
c
h 'os/commit-
s
u
b
m
odu
l
e-ignore' into maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C Ham
a
n
o
Merge b
r
anch 'jk/re
c
eive-pac
k
-un
p
ack
-
error-to-pusher
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Ju
n
i
o
C
H
aman
o
Merge branc
h
'rt/maint-clone-sin
g
le' into maint
commit
|
commitdiff
|
tree
2012-10-08
Ju
n
io
C
Ha
m
ano
Merge bra
n
ch 'jc/blame-follow
s
-renames' into maint
commit
|
commitdiff
|
tree
2012-10-08
J
u
ni
o
C Hamano
Merge bra
n
ch '
l
t/
m
ai
l
i
nfo-handle-a
t
tachment-more-sanely
.
.
.
commit
|
commitdiff
|
tree
2012-10-07
Nguyễn Thái Ngọc Duy
gitignore
.
txt:
s
ugge
s
tio
n
s how t
o
get lite
r
al #
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-05
Junio C Hamano
gi
t
cli: parse-options lets yo
u
omit ta
i
l of lon
g
op
t
i
o
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-04
Junio C
H
amano
p
a
int_down_to_common(): parse commit before relying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-03
Junio C
H
a
mano
Updat
e
d
raf
t
r
elease
notes to 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-03
Junio C Hamano
Merge
branch 'n
d
/grep-reflog'
commit
|
commitdiff
|
tree
2012-10-03
Junio C Hamano
Merge branch 'lt/m
a
i
linfo-handle-attachment-more
-
sanely'
commit
|
commitdiff
|
tree
2012-10-03
Ju
n
i
o
C Haman
o
Mer
g
e bra
n
c
h
'
tu/gc-auto-quiet'
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
t1450: the o
r
der the
o
bje
c
ts are
check
e
d is
u
ndef
i
ned
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Jun
i
o C
H
amano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2012-10-02
J
u
nio
C
Ha
m
a
no
S
tart p
r
e
p
ar
i
ng for 1
.
7
.
12
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Junio C
Hamano
Merge branch
'rr/maint-sub
m
odu
l
e-unknown-cmd' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
Merge bran
c
h 'sp/maint-http-
e
nable-gzip' into maint
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
M
erge branch 'sp/main
t
-http-
i
nfo-refs-
n
o-retry' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Peter Krefting
l10n: Fix to Swedish translation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Ramk
u
mar
R
amachandra
Documentation
:
mention `
p
ush
.
default` in git-push
.
t
x
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
RelNotes
/
1
.
8
.
0: variou
s
t
y
p
o and
s
tyle f
i
x
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hama
n
o
Git 1
.
8
.
0-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-01
J
unio C Hamano
Merge b
r
anch
'jk/co
m
pletion-tests'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
Merge b
r
anch 'ep/
m
alloc-check-pertu
r
b'
commit
|
commitdiff
|
tree
2012-10-01
Junio C
H
a
mano
Merge branch 'da
/
mergetool-cust
o
m'
commit
|
commitdiff
|
tree
2012-10-01
Junio C
H
amano
Merge bran
c
h 'os/commit-su
b
m
odule-
i
gnore'
commit
|
commitdiff
|
tree
2012-10-01
J
unio C
Hamano
M
erge
branc
h
'jc/blam
e
-fol
l
ows-re
n
a
mes'
commit
|
commitdiff
|
tree
2012-10-01
Jun
i
o C Hamano
Merge branch 'jk/
r
eceive-pack-unpack-error-to-pusher
'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
Merge branch
'
rt/maint-
c
lone
-
singl
e
'
commit
|
commitdiff
|
tree
2012-10-01
Linus Torvalds
mai
l
i
n
f
o: don
'
t requi
r
e "text"
m
ime t
y
pe for a
t
tachments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
Jun
i
o C H
a
ma
n
o
Merge
g
i
t://g
i
t
hub
.
com/git-l10n
/
g
i
t-
p
o
commit
|
commitdiff
|
tree
2012-09-30
Junio
C
Hamano
Update draf
t
release
no
t
es to
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio C Hamano
Sync
wit
h
1
.
7
.
12
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
Juni
o
C
Haman
o
Git 1
.
7
.
12
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
io C Hamano
Merge branch
'maint'
o
f git://github
.
com/git-
l
10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Jun
i
o
C Ha
m
ano
Merge
bra
n
ch 'jc
/
m
a
int-lo
g
-grep-all-
m
atch-1
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-09-30
Junio C
Hamano
Merge
b
r
anch 'jc/maint-mailinfo
-
mime-attr' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-09-30
Junio C H
a
m
a
no
Merge branch
'
rr/mai
n
t-submodule-unknown-cmd'
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merge b
r
anch '
r
s/arc
h
ive-zip-u
t
f
8'
commit
|
commitdiff
|
tree
2012-09-30
Junio C
H
a
mano
Mer
g
e branc
h
'jk/
s
mart-htt
p
-switch'
commit
|
commitdiff
|
tree
2012-09-30
Junio C H
a
mano
Merge br
a
nch
'
sp/maint-http-enable-g
z
ip'
commit
|
commitdiff
|
tree
2012-09-30
Junio C
Ha
m
ano
Merg
e
branch 'sp/maint-http
-
info-ref
s
-no-retry'
commit
|
commitdiff
|
tree
2012-09-30
Junio
C
Hamano
Me
r
ge bran
c
h 'aw
/
rebase-i-edit-todo'
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merge b
r
anch 'js/rebase-exec
-
comma
n
d-n
o
t
-
fo
u
nd'
commit
|
commitdiff
|
tree
2012-09-30
Junio C Haman
o
Merge
b
r
a
nch
'
rr
/
test-use-shell-path-not-shell'
commit
|
commitdiff
|
tree
next