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
Documentation: document pitfalls with 3-way merge
2013-12-02
Junio C Ham
a
no
G
it
1
.
8
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-02
Junio C Hamano
submodule: do n
o
t copy u
n
known upd
a
te m
o
de from
.
gitmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-20
Junio
C
H
amano
Gi
t
1
.
8
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-18
Junio C Hamano
Revert "upload-pack: sen
d
non-HEA
D
sy
m
bolic
refs"
commit
|
commitdiff
|
tree
2013-11-08
Junio C Ha
m
a
n
o
Git
1
.
8
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-08
Junio C
Hamano
Merge branch 'jn/test-prereq-perl-d
o
c' into
m
aint
commit
|
commitdiff
|
tree
2013-11-08
Junio C Hamano
Merge branch '
a
p/remote-hg-unquote-
c
qu
o
te' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2013-11-08
Juni
o
C Hamano
Merge bra
n
ch
'
jc/upload-pa
c
k-send-
s
ymr
e
f' i
n
to maint
commit
|
commitdiff
|
tree
2013-11-08
Junio C Hama
n
o
M
e
rge br
a
n
c
h
'
j
k/http-aut
h
-
redir
e
cts
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2013-11-07
J
u
nio C Hamano
Start preparing f
o
r
1
.
8
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-07
Juni
o
C Ha
m
a
n
o
Merge branch 'sc/doc-howto-
d
umb-ht
t
p' i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2013-11-07
Juni
o
C
Hamano
Merge branch 'vd/doc
-
unpa
c
k-ob
j
ects' into
m
a
int
commit
|
commitdiff
|
tree
2013-11-07
Junio C Hamano
Mer
g
e
bran
c
h
'jk/subtree-install-fix' into maint
commit
|
commitdiff
|
tree
2013-11-07
Junio C H
a
ma
n
o
M
e
r
g
e branch 'hn
/
log-
g
raph
-
c
o
lor-octopus'
i
nto
main
t
commit
|
commitdiff
|
tree
2013-11-07
Juni
o
C
H
a
m
ano
Merg
e
branc
h
'mm/c
h
eckout-a
u
to-t
r
ack-fix' int
o
maint
commit
|
commitdiff
|
tree
2013-11-07
Junio C Hamano
Merge branch 'sg
/
prompt-svn-remote-fix'
into maint
commit
|
commitdiff
|
tree
2013-11-07
J
unio C
Haman
o
Merge
b
ranch 'jk/split
-
brok
e
n-ident' int
o
main
t
commit
|
commitdiff
|
tree
2013-11-07
J
u
nio C Hamano
Merge bran
c
h 'jc/revi
s
i
o
n-range-unpeel' i
n
to
maint
commit
|
commitdiff
|
tree
2013-10-28
J
u
n
io
C
Hama
n
o
Git 1
.
8
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-28
Juni
o
C
Ha
m
ano
Merge branch 'jk/clo
n
e-progress-to-stde
r
r' into ma
i
nt
commit
|
commitdiff
|
tree
2013-10-28
J
u
nio
C Hamano
Merge bran
c
h 'jk/format-patch-fro
m
' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2013-10-28
Junio C Hamano
Mer
g
e
branch 'jk/shortlog-tol
e
rate-broken-c
o
mmit' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2013-10-28
Juni
o
C Hamano
Merge branch 'jk
/
diff-al
g
o' in
t
o maint
commit
|
commitdiff
|
tree
2013-10-23
Junio C Hamano
Almost 1
.
8
.
4
.
2 ;-)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-23
Ju
n
i
o
C Hama
n
o
M
erge b
r
a
n
ch 'jc/ls-
f
i
l
es-k
i
l
l
e
d
-optim' into
m
a
i
nt
commit
|
commitdiff
|
tree
2013-10-23
Junio
C
Hamano
Merg
e
b
r
an
c
h 'jh/
c
heckout-auto-tracking' into m
a
int
commit
|
commitdiff
|
tree
2013-10-23
J
u
nio C
H
amano
Merge
b
r
a
nch 'nd/fetch-into-
s
hallow' i
n
to m
a
int
commit
|
commitdiff
|
tree
2013-10-22
J
u
nio C Hamano
Merge branch 'jk
/
clone-progress-to-
s
tderr
'
into jc
.
.
.
commit
|
commitdiff
|
tree
2013-10-17
Junio C Hamano
Sta
r
t prep
a
r
i
n
g
for 1
.
8
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-17
Junio C
Hamano
Me
r
ge bran
c
h '
j
k/upload-pack-keepal
i
ve' into maint
commit
|
commitdiff
|
tree
2013-10-17
Jun
i
o C Hamano
Merg
e
branch 'bc/h
t
tp-backend-
a
llow-405' into maint
commit
|
commitdiff
|
tree
2013-10-17
J
u
nio C Hamano
Merge branch 'jc/cvs
s
erver-perm-bit-fix'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2013-10-17
Juni
o
C Hamano
Merge b
r
anc
h
'js/
a
dd-i-mingw
'
into
m
aint
commit
|
commitdiff
|
tree
2013-10-17
Juni
o
C Ha
m
ano
Me
r
ge br
a
nc
h
'nd/git-dir
-
pointing
-
at-g
i
tfile' into
.
.
.
commit
|
commitdiff
|
tree
2013-10-17
Junio C Ham
a
no
Merge branch 'jk/has-sha1-file-retry-packed
'
into maint
commit
|
commitdiff
|
tree
2013-10-17
Junio C Hamano
Mer
g
e bra
n
c
h 'a
p
/com
m
it-a
u
thor-mai
l
map'
i
nto maint
commit
|
commitdiff
|
tree
2013-10-17
Ju
n
io C Hamano
Merge b
r
a
n
c
h '
e
s/rebase-i-no-abbrev' int
o
maint
commit
|
commitdiff
|
tree
2013-10-17
Junio C Hamano
M
e
rge branch 'rt
/
re
b
ase-p-no
-
merge-summary' into maint
commit
|
commitdiff
|
tree
2013-10-17
J
uni
o
C
H
a
m
ano
Merge branch '
e
s
/
rebase-i-
r
esp
e
ct
-
core-commentchar
.
.
.
commit
|
commitdiff
|
tree
2013-10-15
Junio C
H
amano
revision: do no
t
p
e
e
l
tags used i
n
rang
e
notation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Ju
n
io C Ha
m
a
no
Start prep
a
r
i
ng for 1
.
8
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Ju
n
io C Hamano
M
erge br
a
nch 'b
c
/
completion-for-bash-3
.
0' into
m
aint
commit
|
commitdiff
|
tree
2013-09-18
Ju
n
i
o C Hamano
Merge
b
r
a
nch 'mm/no-shell-escape-in-die-mess
a
ge
'
into
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
Merg
e
branch 'jl
/
s
ome-subm
o
dule-con
f
ig-
a
r
e-not-boolean
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
Me
r
ge bra
n
ch 'tr/
l
og
-
full-dif
f
-keep-tr
u
e-pa
r
ents
'
into
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Jun
i
o
C
Ha
m
ano
M
e
r
ge branch 'jc/trans
p
ort-
d
o-n
o
t-use-c
o
nnect-twice
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
M
erge branch 'sp/clip-rea
d
-write-t
o
-8m
b
' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2013-09-18
Ju
n
io C
H
amano
M
e
rge branch 'j
k
/mailm
a
p-incomplete-line
'
in
t
o maint
commit
|
commitdiff
|
tree
2013-09-18
J
u
nio C Ha
m
ano
clon
e
:
test the n
e
w
H
EAD detection logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Ju
n
io C Hama
n
o
c
o
nnect
:
a
nnotate refs with their symre
f
in
f
ormation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio
C Hamano
co
n
nect
.
c: make par
s
e_feature_val
u
e()
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C Ha
m
a
n
o
upload-pack: send non
-
H
E
AD
symbolic re
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C
H
ama
n
o
upload
-
pack: send
s
y
mbo
l
i
c ref information as capabilit
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
J
unio C Hamano
u
p
l
oad-pack
.
c: do not pass c
o
nfusing cb
_
data to mark_our_ref()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
t
5
5
0
5
: fix "set-head --auto with ambiguous HEAD" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-12
Junio C Hamano
M
e
rge branch '
m
aint
'
of git://g
i
thub
.
com/git-
l
10n
/
git
.
.
.
commit
|
commitdiff
|
tree
2013-09-11
Junio C
H
amano
cvsserver:
p
ick
up t
h
e
r
i
g
ht mode bits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-05
Jun
i
o C Hamano
Merge
b
ranch 'nd/fetch-pack-shallow-fix' into maint
commit
|
commitdiff
|
tree
2013-09-05
Junio C Hamano
Merge branch 'h
v
/config-from-
b
lob'
i
nto maint
commit
|
commitdiff
|
tree
2013-09-05
Junio C
Hamano
Merge branch 'maint-1
.
8
.
3
' into m
a
i
n
t
commit
|
commitdiff
|
tree
2013-09-05
Junio C Hamano
Merge b
r
anch 'maint-1
.
8
.
2' into maint-1
.
8
.
3
commit
|
commitdiff
|
tree
2013-09-03
Junio C
H
amano
M
erge git://githu
b
.
c
o
m/git-l10n/gi
t
-
po i
n
to m
a
int
commit
|
commitdiff
|
tree
2013-09-03
Ju
n
io C Haman
o
Merge br
a
nch 'maint-1
.
8
.
3' into
maint
commit
|
commitdiff
|
tree
2013-09-03
J
unio C
H
a
m
a
no
M
e
r
ge branch 'm
a
int-1
.
8
.
2'
in
t
o main
t
-1
.
8
.
3
commit
|
commitdiff
|
tree
2013-08-26
Junio C Hamano
rebase -
i
: fix
s
ho
r
t SHA-1 collisio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-23
Junio
C Ham
a
n
o
Git 1
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-21
Junio C Hama
n
o
Typofix draft r
e
lease notes to 1
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-19
Juni
o
C Hamano
Git 1
.
8
.
4-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-15
Juni
o
C Hamano
t3010: update to demo
n
strate "ls-files -k" optimizat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-15
Jun
i
o C Haman
o
ls-fi
l
es -k: a directory
o
nly can be killed if the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-15
Junio C
Hamano
dir
.
c: use the ca
c
h
e_* m
a
c
ro to a
c
cess the current
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-14
Junio C Ha
m
ano
Revert "Add ne
w
@ s
h
ortcut for HEAD"
commit
|
commitdiff
|
tree
2013-08-14
Ju
n
io C Hamano
Revert "git
s
t
ash: avoid d
a
ta los
s
w
h
en
"git st
a
s
h
.
.
.
commit
|
commitdiff
|
tree
2013-08-13
Juni
o
C Hamano
Git 1
.
8
.
4-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-13
Jun
i
o C Hamano
M
e
r
ge git:/
/
github
.
com/gi
t
-l10n/git-po
commit
|
commitdiff
|
tree
2013-08-13
Ju
n
io C Hamano
Merge branch
'
sb
/
mailmap-up
d
at
e
s'
commit
|
commitdiff
|
tree
2013-08-13
Junio C Hamano
.
mailmap: upda
t
e long-lost frie
n
ds with mu
l
tiple def
u
nct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-09
Junio C Ham
a
n
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2013-08-09
J
un
i
o C Haman
o
Merge
b
ranch 'master
'
o
f
git:
/
/git
h
ub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2013-08-09
Jun
i
o C
Hamano
Merge branch 'jk/s
u
bmodule-subdirectory-ok'
commit
|
commitdiff
|
tree
2013-08-09
Junio C H
a
man
o
Merge branc
h
'sb/mailmap-up
d
ates'
commit
|
commitdiff
|
tree
2013-08-08
J
unio C
Hamano
G
i
t
1
.
8
.
4-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
Junio C Hamano
f
e
tch: work around
"tr
a
nspor
t
-t
a
ke-o
v
er" hack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
Jun
i
o C Hamano
fetch: refactor c
o
d
e t
h
at fetc
h
es lefto
v
er t
a
gs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
J
u
n
io
C Ham
a
no
f
e
tch: refac
t
or cod
e
t
h
at pre
p
ares a transport
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
Junio
C Hama
n
o
fetch: r
e
name
file
-
scope g
l
obal "t
r
ansp
o
rt" to "gtransport"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
Junio C H
a
ma
n
o
t5802: add t
e
st for connect hel
p
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-05
Ju
n
io C
Hamano
Sync with maint t
o
grab trivial do
c
fixes
commit
|
commitdiff
|
tree
2013-08-05
Junio C
H
amano
Merge bran
c
h 'e
s
/blame-L-break
a
ge
'
commit
|
commitdiff
|
tree
2013-08-05
Junio C Hamano
M
erge git://github
.
com/g
i
t-l1
0
n/git-po
commit
|
commitdiff
|
tree
2013-08-05
Junio C Hamano
Merge branch 'sb/mailmap-upd
a
t
es'
commit
|
commitdiff
|
tree
2013-08-05
Junio C Hamano
Merge
branch 'dn/tes
t
-reject
-
utf-16'
commit
|
commitdiff
|
tree
2013-08-05
Junio C
H
amano
M
erge br
a
nch 'bc
/
co
m
mit-i
n
v
a
l
id
-
utf
8
'
commit
|
commitdiff
|
tree
2013-08-05
Jun
i
o C Hamano
com
m
it: typofix for xxFFF[
E
F
] che
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-05
Junio C H
a
mano
t
3900: t
e
s
t
rejec
t
ing lo
g
message
with NU
L
s correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-02
Junio C Hamano
Me
r
ge branch 'rj/cy
g
win-clarify-use-of-che
a
ting-lstat'
commit
|
commitdiff
|
tree
2013-08-02
Junio
C
Hamano
Merg
e
branc
h
'jk/cat-file-ba
t
ch-op
t
im'
commit
|
commitdiff
|
tree
2013-08-02
Junio C Hama
n
o
Revert "c
a
t
-
f
ile
:
spli
t
--batch input lines on whitespace"
commit
|
commitdiff
|
tree
2013-08-01
Ju
n
io C Ham
a
no
Gi
t
1
.
8
.
4-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-01
Junio C Hamano
Merge branch
'ob/typofixe
s
'
commit
|
commitdiff
|
tree
next