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
merge-tree: fix d/f conflicts
2012-12-26
Junio C H
a
m
a
n
o
merge-tree:
f
ix
d
/f conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Junio
C
Hamano
m
erge-tree: ad
d
comm
e
nts to clar
i
fy w
h
at th
e
se functions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
merg
e
-tree: lose unused "resolve_
d
i
r
ectori
e
s"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
merge-tre
e
: los
e
u
n
used "f
l
ags"
f
rom
m
erge_list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-10
Junio C Hamano
Which m
e
rge_file() fu
n
ction do yo
u
me
a
n
?
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-04
Junio C
H
ama
n
o
Mer
g
e branch '
m
m/status
-
push-pull-advise'
commit
|
commitdiff
|
tree
2012-12-03
Junio C
Ha
m
ano
G
i
t 1
.
8
.
1-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-03
J
u
nio
C Hamano
Merge branch
'
m
m
/status-pus
h
-pull-advis
e
'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio
C Hamano
Updat
e
draf
t
r
e
lease
n
o
t
es to
1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
J
unio
C Ha
m
ano
Merge br
a
nch 'pw/p4-various-fix
e
s'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Mer
g
e
branc
h
'lt/diff-stat-s
h
ow-0-lines'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
H
amano
Merge branch 'fc/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C
Hama
n
o
M
e
r
g
e branch 'mk/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C
Ha
m
ano
M
erge branch
'
jc
/
d
oc-push-satellite'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C H
a
mano
Mer
g
e b
r
anc
h
'
km/send-e
m
ail-
r
e
move-c
r
uft-in-addr
e
ss'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Hamano
Merge bran
c
h 'j
k
/s
e
n
d-em
a
il-send
e
r-prompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'fc/send-ema
i
l-no-sender-
p
rompt'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hamano
Merge
branch 'er/do
c
-add-new-commands'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge br
a
nc
h
'jl/
s
ubmodul
e
-r
m
'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hamano
Merge
b
ranch
'
pp/
g
it
w
eb-config-u
n
derscore'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Haman
o
M
e
rge
bra
n
ch
'
fc/com
p
letion-test-simpli
f
ication'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Mer
g
e b
r
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'master'
o
f
gi
t
://githu
b
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
J
u
n
i
o C Hamano
t4049: refocus tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
J
unio
C
H
amano
M
e
rge branch '
m
aste
r
'
of
git://github
.
com
/
git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ham
a
no
U
p
d
ate
d
ra
f
t relea
s
e
notes to 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o
C
H
amano
Mer
g
e
branch 'fc
/
zsh-comp
l
etion'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
Merge bra
n
c
h
'm
m
/status
-
push-pu
l
l-advise
'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge branch 'j
k
/pickaxe-te
x
t
conv'
commit
|
commitdiff
|
tree
2012-11-28
J
unio
C
Hamano
S
t
art preparing for 1
.
8
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge branc
h
'rh/maint-gitw
e
b
-highlig
h
t-ext' into mai
n
t
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
M
e
rge branch 'pw/maint
-
p4-rcs-
e
xpansion-newline' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
J
u
n
io C
Ha
m
ano
M
erge br
a
nch 'fc/send-
e
mail-no-sender-prompt'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio
C Haman
o
Documenta
t
ion/g
i
t-pu
s
h
.
txt: clari
f
y the "p
u
sh
f
rom
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Hamano
diff
-
-sh
o
rts
t
at
:
do not count "unme
r
ged" en
t
ries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
J
unio
C
Hamano
Merge b
r
anch
'
maint
'
commit
|
commitdiff
|
tree
2012-11-27
Junio
C
Hama
n
o
Merge
b
ra
n
ch 'nd/maint-compat-fnmatch-fi
x
'
i
nt
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-11-27
Junio C
Hamano
Merge branch
'
jh/update-ref-d-through-symref
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
J
unio C
Hamano
Me
r
ge branch
'
esr/m
a
int-do
c
-fast-im
p
ort' into maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ham
a
no
Merge
b
ranc
h
'wtk/submodul
e
-doc
-
f
ixup' into maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
diff --
s
tat: do not count "
u
nmerged" entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Hamano
diff --sta
t
:
m
ove
t
h
e
"total count" l
o
gic to the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Hama
n
o
diff -
-
stat:
use "file" temporary va
r
iable to refer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
di
f
f --stat: status of u
n
modified pair in di
f
f-q is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
J
u
n
io C H
a
mano
t
est: add f
a
i
ling tests
for
"diff
-
-stat
"
to
t4049
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2012-11-26
J
unio
C
H
amano
Updat
e
draft
rele
a
se notes to
1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
ano
Merge br
a
n
ch
'
rr/submodule-
d
iff-config'
commit
|
commitdiff
|
tree
2012-11-26
J
unio C Hamano
M
e
rge b
r
anch 'nd/maint-compat-fnmatch-fix'
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o C Hamano
Merge branch 'bc/
d
o-not-rec
u
rse-in
-
die'
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
mano
Merge branch 'mk
/
co
m
plete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C H
a
ma
n
o
Merge branch 'jh/update
-
ref-d-th
r
ough-s
y
mref'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C H
a
mano
M
erg
e
bra
n
ch
'
lt/dif
f
-
stat-s
h
ow-0-
l
ines'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge bran
c
h 'sg/complet
e
-
hel
p
-
u
ndup'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
a
mano
Sync
w
ith 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C Hama
n
o
G
i
t 1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Hamano
Merge b
r
anch 'jk/checkout-o
u
t-
o
f-unb
o
r
n' i
n
to
maint
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o
C Hamano
Merge branch 'cn/config
-
missing-path' into maint
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hama
n
o
M
erge b
r
anch 'jk/maint-gitweb-xss' into
m
aint
commit
|
commitdiff
|
tree
2012-11-21
J
u
n
i
o C
Ha
m
ano
Upd
a
te draf
t
release notes f
o
r 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
Hama
n
o
Me
r
g
e
branch 'esr/
m
ai
n
t-doc-fast-i
m
port'
commit
|
commitdiff
|
tree
2012-11-21
J
u
nio C Hamano
Merge branch 'wt
k
/submodule
-
do
c
-fi
x
up'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge branch 'so/promp
t
-c
o
mmand'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
M
e
rge br
a
n
c
h 'jk/config
-
ignore
-
d
u
p
licates'
commit
|
commitdiff
|
tree
2012-11-21
J
u
n
io C Haman
o
M
erge bra
n
ch 'jk/maint-htt
p
-
h
al
f
-auth
-
fe
t
ch'
commit
|
commitdiff
|
tree
2012-11-20
Junio C H
a
m
ano
Sixth batch for 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
Junio C H
a
mano
M
erge b
r
an
c
h 'ml/cygwin-mingw-headers'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Merge branch 'jk/checko
u
t
-
out-of-unborn'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merg
e
b
r
an
c
h 'cn/c
o
nfi
g
-missing-
p
a
th'
commit
|
commitdiff
|
tree
2012-11-20
Junio C
H
amano
Merge branch 'jl/submodule-rm'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio
C
Hamano
M
erge
branch 'mg/replace-resolve-delete'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C Hamano
Merge branch '
j
k/maint-
g
itweb-xss
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge br
a
nch 'rh/maint-git
w
eb
-
highlight-ex
t
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
er
g
e branch 'pw/maint-p4-rcs-ex
p
ansion-newline'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C H
a
mano
Merge branch 'mh/al
t
-odb-
s
tring-list-cleanup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'ta/do
c
-cl
e
anup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hama
n
o
Merge branch
'
kb/preload-in
d
ex-mor
e
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'jk/m
a
i
n
t-http-h
a
lf-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
J
unio C Hamano
S
ync with ma
i
nt
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
F
urther preparation
f
or 1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C
H
amano
Merge
b
ranch 'mg/m
a
i
nt-pul
l
-
s
u
ggest-up
s
tream-to
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C
H
ama
n
o
Merge branch 'mm/
m
a
int-doc-commit-e
d
it' i
n
to maint
commit
|
commitdiff
|
tree
2012-11-20
J
unio C
H
ama
n
o
Merge branch 'as/
m
aint-doc-f
i
x-no-post-rew
r
i
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'rs/lock-correct-
r
ef-d
u
ring-delete
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C Hamano
Merge
branc
h
'rf/maint-mailm
a
p-of
f
-by-one
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-11-20
Junio C
Hamano
Merge branch 'jk/maint-
d
iff-grep-t
e
xtconv' into m
a
int
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch '
j
s/format-2047'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
i
o
C
Ha
m
ano
Sync with maint
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C
H
a
mano
S
tart p
r
epa
r
ing
f
or
1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Hamano
M
e
rge br
a
nch 'sz/maint-curl-multi-timeout' into maint
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio C Hamano
Merge branch 'po/maint-refs-
r
ep
l
ace-docs' into maint
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C Hamano
Merge bra
n
ch 'ph/pull-rebase-deta
c
he
d
' into main
t
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Hamano
Me
r
ge br
a
nch 'mm/maint-doc-remote-tracking' into maint
commit
|
commitdiff
|
tree
2012-11-19
Jun
i
o C Hama
n
o
M
erge bra
n
c
h
'
r
s/branch-de
l
-s
y
mref' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
Jun
i
o C Hamano
Merge
branch 'nd/grep-
t
rue-pa
t
h' into maint
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio C
H
amano
Me
r
ge b
r
anc
h
'jc/grep-pcre-loose-
e
nds
'
(ea
r
ly part
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge
b
ranch 'da
/
mer
g
etools-p
4
'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C Hamano
M
e
r
ge branch 'jc/test-say
-
color-avoi
d
-echo-es
c
ap
e
'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
i
o C Hamano
M
e
rge branch 'bw/config-lift
-
v
a
r
i
a
b
le-name-le
n
gth-limit
.
.
.
commit
|
commitdiff
|
tree
next