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
doc: generate a list of valid merge tools
2013-02-03
David
A
g
u
ilar
d
oc: ge
n
erate a list
o
f va
l
i
d merge tools
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merg
e
too
l
--lib: list u
s
er
conf
i
g
u
r
e
d
tools in '--too
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
m
ergetoo
l
--lib: add f
u
nctions for
f
inding availab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool
-
-lib:
improve th
e
help text in guess_
m
erge
_
tool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguilar
m
ergetool--lib: s
i
m
p
lify command e
x
pr
e
ssions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetoo
l
s: sim
p
li
f
y h
o
w w
e
handl
e
"vim" a
n
d "defa
u
lts"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
mergetool--li
b
: don't
c
a
ll "exit" in set
u
p
_tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guilar
mergetool
-
-lib: impr
o
ve
s
ho
w
_tool_help() outp
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
v
id Aguila
r
mergetools/vim
:
r
e
move redundant
d
iff co
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
ing
git-difftool: use git-m
e
r
g
e
tool--lib
f
or "--to
o
l-help"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
g
it-me
r
get
o
ol
:
don't hardcod
e
'merge
t
ool' in
s
how_tool_
h
el
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-mergetool: remo
v
e redundant assi
g
n
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
i
ng
g
i
t-mergetool: move sh
o
w_tool_
h
elp to merget
o
ol
-
-l
i
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-21
Junio 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/git-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
Ha
m
ano
M
e
rge git://github
.
com/git-l10n
/
git-
p
o
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Sync with 1
.
7
.
12
.
4
commit
|
commitdiff
|
tree
2012-10-17
Junio
C
Hamano
Git 1
.
7
.
12
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-17
Junio C Hamano
Merge branch 'jk/maint
-
http-h
a
lf-a
u
th-p
u
sh' into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C Haman
o
Mer
g
e branch 'rr/git-uri-doc'
into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C
H
a
ma
n
o
Me
r
ge
b
r
anch 'bw/cp-a-is-
g
nui
s
m
'
into
m
a
int
commit
|
commitdiff
|
tree
2012-10-17
Ju
n
io C Hamano
M
erge branch 'nd/d
o
c-
i
g
n
ore' int
o
main
t
commit
|
commitdiff
|
tree
2012-10-17
J
u
ni
o
C Ha
m
ano
Merge branch
'jc/do
c
-
l
ong-op
t
ions' into maint
commit
|
commitdiff
|
tree
2012-10-17
Jun
i
o C H
a
mano
Mer
g
e branch 'jc/maint-t145
0
-
f
s
ck-order-
f
i
x' into
m
aint
commit
|
commitdiff
|
tree
2012-10-17
J
u
n
io C Hamano
Merge
bran
c
h 'rr/test-use-shell
-
path-n
o
t-shell' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-17
Jun
i
o
C Hamano
Merge
b
ran
c
h 'rr/test-make-sure-w
e
-h
a
v
e-git' into maint
commit
|
commitdiff
|
tree
2012-10-17
Juni
o
C
Hamano
Merg
e
branch 'po/maint-docs' into maint
commit
|
commitdiff
|
tree
2012-10-17
Ju
n
io C Hamano
Merge branc
h
'jc/l
l
-merge-bina
r
y-ours' i
n
to maint
commit
|
commitdiff
|
tree
2012-10-17
J
u
nio C Hamano
Me
r
ge branch
'db/do
c
-cu
s
tom-xm
l
to' into maint
commit
|
commitdiff
|
tree
2012-10-16
Thomas Ackermann
Documentatio
n
/RelNotes: re
m
ove
"updated
up to this
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-16
Junio C H
a
mano
U
p
date d
r
aft relea
s
e notes to 1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-16
Junio C Hamano
Merge bran
c
h 'jk/main
t
-
ht
t
p
-half-au
t
h-pus
h
'
commit
|
commitdiff
|
tree
2012-10-14
Jun
i
o C H
a
m
ano
M
erge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2012-10-14
Richard Fearn
Fix
s
pellin
g
error in post-
r
eceive-em
a
i
l
hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-12
Junio
C Hama
n
o
M
e
rge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2012-10-12
Jeff King
http: fix segfaul
t
in
handle_c
u
rl_
r
e
s
ult
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-12
Dyla
n
Alex Simon
git
w
eb
.
c
gi: fix "comitt
e
r_tz" ty
p
o
i
n
fe
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-11
Junio C Hamano
Gi
t
1
.
8
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-10
Junio
C
Ham
a
no
M
e
r
g
e branch 'rr/git-uri-d
o
c'
commit
|
commitdiff
|
tree
2012-10-10
Ju
n
io C Hamano
Merge
branch 'b
w
/cp
-
a-is-gnuism
'
commit
|
commitdiff
|
tree
2012-10-10
Junio C
H
am
a
no
Merge branch
'
nd/doc-
i
gnore'
commit
|
commitdiff
|
tree
2012-10-10
J
u
nio C Haman
o
Merge branch 'j
c
/doc-l
o
ng-options'
commit
|
commitdiff
|
tree
2012-10-10
Junio
C Hamano
Sync
with mai
n
t
commit
|
commitdiff
|
tree
2012-10-10
J
u
nio C Hamano
M
e
r
ge git://b
o
g
omips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-10-10
Ram
s
ay
J
o
nes
MALLOC_CH
E
CK: Allow c
h
eck
i
n
g to
be di
s
abled
f
r
om con
f
ig
.
mak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-10
Nguyen T
h
a
i
Ng
o
c Duy
a
t
tr: a not
e
about the or
d
er of
.
g
i
tattributes lo
o
ku
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-09
Junio C Haman
o
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2012-10-09
Øyvin
d
A
.
Holm
configure
.
ac: Add missin
g
comma t
o
CC_LD_DYNPATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-09
Jun
i
o C Hamano
M
er
g
e
branc
h
'ma
i
nt' of gi
t
://g
i
th
u
b
.
com/git-l
1
0n/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Ben Walton
test
s
: "cp
-a" is
a GNUism
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-08
Ramkumar Ramachandra
G
i
t url doc
:
mark ftp/ftps as read
-
only and deprec
a
te
.
.
.
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
e
r
ge
b
ranch
'
jc/mai
n
t-t1450-fsck-o
r
d
er-fix'
commit
|
commitdiff
|
tree
2012-10-08
Junio C Ha
m
ano
Merg
e
branc
h
'jc/merge-
b
as
e
s
-
pain
t
-fix'
commit
|
commitdiff
|
tree
2012-10-08
Juni
o
C Hamano
Sync with
1
.
7
.
12
.
3
commit
|
commitdiff
|
tree
2012-10-08
Junio
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
Hamano
Merge b
r
anch 'os/commit-submodule-ignore'
i
nto maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C
Ham
a
n
o
Merge branch 'jk/r
e
ceive-
p
ack-unpack-er
r
or-to-pusher
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Juni
o
C
H
a
mano
Merge branch 'rt/maint-clon
e
-single' into maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C Ham
a
no
Merge branch 'jc/blame-follows-renames' into m
a
int
commit
|
commitdiff
|
tree
2012-10-08
Junio C H
a
mano
Merge branch 'lt/mailinfo-handle-attachme
n
t-more-
s
anely
.
.
.
commit
|
commitdiff
|
tree
2012-10-07
Nguyễn Thái Ngọc Duy
g
it
i
gnore
.
txt: s
u
gg
e
stions how to get literal # or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-05
J
u
nio C Ha
m
ano
gitcli: parse-options lets you omit tail of l
o
n
g optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-04
Juni
o
C Hamano
p
a
int_down
_
t
o
_comm
o
n(
)
: parse commit
be
f
or
e
relying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-03
Junio C Haman
o
Upda
t
e draft release no
t
e
s t
o
1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-03
Junio C
H
amano
Merge bran
c
h 'nd
/
grep-reflo
g
'
commit
|
commitdiff
|
tree
2012-10-03
J
u
n
io C
H
ama
n
o
Merge
b
ranch '
l
t/
m
ailinfo-handle-att
a
chment-more-sanely'
commit
|
commitdiff
|
tree
2012-10-03
Junio C Ham
a
no
Merge branch 't
u
/gc-a
u
t
o
-quiet'
commit
|
commitdiff
|
tree
2012-10-02
Junio C
H
amano
t14
5
0
:
the
order the objects ar
e
checked is und
e
fin
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-02
J
u
nio C
Hama
n
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2012-10-02
Junio
C Ham
a
no
Start
p
repari
n
g for 1
.
7
.
12
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
Merge b
r
anch 'rr/maint-submodule-
u
n
k
nown-cmd' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Ju
n
io C H
a
mano
Merg
e
branch 's
p
/maint-http-enable-gzip'
i
nto maint
commit
|
commitdiff
|
tree
2012-10-02
Jun
i
o C
H
amano
M
e
rge
b
ranc
h
'sp/main
t
-
h
ttp-info-ref
s
-no-re
t
r
y' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Peter Kr
e
fting
l
1
0
n
: Fix
t
o Swedish translatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-02
Ramkumar R
a
machand
r
a
Documentation:
m
ention
`
push
.
default`
i
n g
i
t-push
.
txt
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
c
hael J Gruber
Re
l
Notes/1
.
8
.
0: vari
o
us ty
p
o 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
b
ra
n
ch 'j
k
/completion-tests'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
Merg
e
b
r
anch 'ep/malloc-check
-
pe
r
turb'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Ham
a
no
Merge branch 'da
/
m
e
rgetool-custom'
commit
|
commitdiff
|
tree
2012-10-01
Junio C Hamano
Me
r
ge
br
a
nch 'os/commi
t
-submodule-ignore'
commit
|
commitdiff
|
tree
2012-10-01
Junio
C Hamano
Merge branch 'jc/blame-follows-ren
a
mes'
commit
|
commitdiff
|
tree
2012-10-01
Juni
o
C
H
a
mano
Merge bra
n
ch
'
jk/receive-pack-un
p
a
c
k
-erro
r
-to-pusher'
commit
|
commitdiff
|
tree
2012-10-01
J
uni
o
C
H
amano
M
erge
b
ranch '
r
t/maint
-
clone
-
single'
commit
|
commitdiff
|
tree
2012-10-01
Linus
Torvalds
mailinfo: do
n
't requi
r
e "text" mime ty
p
e for attachment
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merge git://g
i
thub
.
com/git-l10n/
g
it-po
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
io 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-09-30
Junio C Ham
a
no
Syn
c
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
Junio C Hama
n
o
Me
r
ge bran
c
h 'maint' of git://github
.
c
om/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merge branch
'jc/maint-log-grep-all-ma
t
ch-
1
' into main
t
commit
|
commitdiff
|
tree
2012-09-30
Juni
o
C
H
a
mano
Mer
g
e
branch 'jc
/
m
a
int-
m
ail
i
nfo-
m
im
e
-attr' i
n
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2012-09-30
Junio
C Hamano
M
erge branch 'rr/ma
i
nt-su
b
module-
u
nknown
-
cmd
'
commit
|
commitdiff
|
tree
2012-09-30
Jun
i
o C Haman
o
Merge br
a
nch 'rs
/
ar
c
hive-zi
p
-utf
8
'
commit
|
commitdiff
|
tree
2012-09-30
J
u
nio
C Hamano
Merge branch 'jk
/
smart-http-switch
'
commit
|
commitdiff
|
tree
2012-09-30
J
u
n
i
o C Hamano
Merge branch
'
s
p
/maint-http-enable-gzip'
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merge branch '
s
p/maint-h
t
t
p
-
i
nfo-refs-no
-
retry'
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Mer
g
e bran
c
h 'aw/rebase-i-edit-todo'
commit
|
commitdiff
|
tree
next