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
Which merge_file() function do you mean?
2012-12-10
Junio C Hamano
Whi
c
h merge_f
i
le() function do you
mean?
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-04
Junio C Hamano
Merge branch
'mm/status-push-pull-advi
s
e'
commit
|
commitdiff
|
tree
2012-12-03
Junio C Hamano
Git
1
.
8
.
1
-
rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-03
Junio C Ham
a
n
o
Merge branch 'mm/status-push-pull-advise'
commit
|
commitdiff
|
tree
2012-11-29
J
u
n
i
o C H
a
m
ano
Update draft release notes to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C
H
amano
Merge bran
c
h
'
pw/p4-vario
u
s-f
i
x
e
s'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C
H
amano
M
erge
b
ranch 'l
t
/d
i
ff
-
stat-
s
how-0-lin
e
s'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hama
n
o
Merge b
r
anch 'fc/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Mer
g
e b
r
anch
'
mk/
c
omplete-
t
csh'
commit
|
commitdiff
|
tree
2012-11-29
Junio C H
a
mano
Merge branch 'jc
/
doc-
p
ush-
s
atellite'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio
C
Hamano
Merge branch 'km/send
-
email-rem
o
ve-cruft-in-
a
ddre
s
s'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge b
r
anch 'jk/s
e
nd-ema
i
l
-
sender-pr
o
mpt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
erg
e
b
r
anch 'fc/
s
end-em
a
il-
n
o-sender
-
prompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
a
n
o
M
erge branch 'er/doc-add-new-commands
'
commit
|
commitdiff
|
tree
2012-11-29
J
un
i
o
C Hama
n
o
Me
r
ge br
a
nch
'
jl/submodule-rm'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ham
a
no
Merge bran
c
h
'pp/gitweb-config-underscore'
commit
|
commitdiff
|
tree
2012-11-29
J
uni
o
C
Hamano
M
e
rge branch 'fc/compl
e
tion-test-simplifica
t
ion'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Mer
g
e b
r
anch
'
m
aint'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hamano
Merge bran
c
h 'ma
s
ter' of gi
t
:
/
/github
.
co
m
/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Junio C Haman
o
t
40
4
9: refocus
t
ests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
e
r
ge br
a
nch 'm
a
ster' of git://git
h
ub
.
co
m
/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Haman
o
Upd
a
te draf
t
re
l
ease notes to 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C
Hamano
Merge branch 'f
c
/zsh-completi
o
n'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ha
m
ano
Merge b
r
anc
h
'mm/status-push-pull-a
d
vise'
commit
|
commitdiff
|
tree
2012-11-28
Junio C
H
a
m
ano
M
e
rge branch 'jk/picka
x
e-tex
t
conv'
commit
|
commitdiff
|
tree
2012-11-28
Junio C H
a
mano
St
a
r
t
preparing f
o
r 1
.
8
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Hamano
Merge branch 'rh/
m
aint-gitweb-hig
h
lig
h
t-ext'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C Ham
a
no
Merge branch 'p
w
/maint-
p
4-rcs-expansion-ne
w
li
n
e' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ham
a
n
o
M
erge b
r
anch 'fc/send-email-no-sender-pro
m
pt' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C Hamano
Documentat
i
on/git-pus
h
.
txt: cl
a
r
i
fy the "push from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
diff --shor
t
stat: do not
c
o
u
nt
"
unmerged" en
t
ries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
amano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ha
m
ano
Me
r
g
e
branch
'nd/maint-co
m
pat-fnmatch-f
i
x' in
t
o
maint
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Hamano
Merge
b
ranch '
j
h/u
p
date-ref-d-t
h
rough
-
symr
e
f' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio C H
a
mano
Merge branch 'esr
/
maint-doc-
f
ast-import' int
o
maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ha
m
ano
Merge br
a
n
c
h 'wtk/submod
u
le-do
c
-fixup' into maint
commit
|
commitdiff
|
tree
2012-11-27
Junio
C
Hamano
diff
-
-sta
t
:
do not
c
oun
t
"
unmerged" entrie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
dif
f
--st
a
t
: move the "t
o
tal count" logi
c
to
t
he l
a
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
diff --s
t
at: use
"
file" tempora
r
y variable to ref
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
dif
f
--stat: sta
t
us of
u
nmodifie
d
p
air
in diff-q
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
J
u
n
i
o C Ham
a
no
test: add failing tests for "d
i
ff --stat" to t4049
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
mano
Update draft
releas
e
notes to 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch
'r
r
/submodule-diff
-
confi
g
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
M
er
g
e branch 'nd/maint-com
p
at-fnmatch-fix'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
M
erge branch 'bc/
d
o-n
o
t-
r
e
c
urs
e
-in-die'
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
i
o
C Haman
o
Mer
g
e branch 'mk/com
p
lete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
i
o
C H
a
mano
Merge
b
ranch 'jh/upda
t
e
-
ref-d-throug
h
-symref'
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C Hamano
M
e
rge
b
r
a
nch
'
lt/diff-stat-
s
how-0-lines'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
no
Merge
branch 'sg/co
m
pl
e
te-help-undup'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
S
yn
c
with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Gi
t
1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
io C Hama
n
o
Mer
g
e branch 'jk
/
ch
e
ckout-out
-
of-unborn
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
mano
Me
r
ge
branch 'cn/
c
onfig-m
i
s
s
ing-path
'
into
maint
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio
C
Hamano
Merge branch 'jk/mai
n
t-gitwe
b
-x
s
s' into
m
a
int
commit
|
commitdiff
|
tree
2012-11-21
Junio C Ha
m
an
o
Update
dr
a
ft
r
elease not
e
s
for 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-21
Jun
i
o C Ham
a
no
Merge branch 'esr/maint
-
doc-fast-imp
o
r
t'
commit
|
commitdiff
|
tree
2012-11-21
Jun
i
o
C Ham
a
no
Merge
branch 'wtk
/
sub
m
o
d
ule-doc-fixup
'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Me
r
ge branch 's
o
/promp
t
-c
o
mmand'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merg
e
branch 'jk/
c
onf
i
g-ignore-duplicate
s
'
commit
|
commitdiff
|
tree
2012-11-21
Juni
o
C Hamano
Merge branch 'jk/m
a
in
t
-http-half-auth-fet
c
h
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Haman
o
Sixth
batch
f
or 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Me
r
ge br
a
nch 'ml/cygwin
-
m
ingw-headers'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hama
n
o
Merge bran
c
h
'jk/checkout-out-of-
u
nborn'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C
Hama
n
o
M
e
rge branch 'cn
/
con
f
ig-mis
s
i
ng-path'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
M
erge branch
'
j
l/submo
d
u
l
e-rm'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C
H
am
a
no
Merge branch 'mg/
r
epla
c
e-re
s
olve-delete'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
erge branc
h
'jk/maint-gitweb-xss'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ha
m
ano
Me
r
ge branch 'rh/maint-gitweb-h
i
g
h
light-ext'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'pw/maint-p4-rcs-ex
p
ans
i
on-
n
ewline'
commit
|
commitdiff
|
tree
2012-11-20
Junio C
Ha
m
ano
M
e
rge branch
'mh/alt-odb-string-list-clean
u
p
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
erge bran
c
h
'
ta/doc-clea
n
up'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'kb/preload-index-more'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merge branc
h
'jk/ma
i
n
t
-http-half-auth
-
f
e
tc
h
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C H
a
mano
Sync with maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C H
a
mano
Further
p
reparati
o
n f
o
r 1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ha
m
ano
Mer
g
e branch 'mg/mai
n
t
-pull-s
u
ggest-upstre
a
m-to'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
J
unio C
H
a
m
ano
Me
r
ge bra
n
ch 'mm/maint
-
doc-commit-edit' into maint
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Hamano
Mer
g
e
br
a
nch 'as/
m
aint-doc-fix-no
-
post-
r
ew
r
ite' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merge branch 'rs/lock-correc
t
-
ref-during-delete' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
J
u
n
io C Ham
a
no
Merge br
a
nch 'rf/maint-mailmap-off-by-on
e
'
into maint
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C H
a
mano
Mer
g
e b
r
an
c
h 'jk/mai
n
t-diff
-
grep-t
e
xtconv' in
t
o
maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
e
rge branch 'js/f
o
rmat-2047
'
into
m
aint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
S
y
n
c with main
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
S
tart prepari
n
g for
1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-19
Jun
i
o
C Hamano
Merge branch 'sz/mai
n
t-curl-mul
t
i
-timeou
t
' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge branch 'po/maint-refs-replace-
d
o
c
s' in
t
o
maint
commit
|
commitdiff
|
tree
2012-11-19
Junio
C
H
amano
M
e
rge
b
ranch 'ph/pull-rebase-d
e
tac
h
ed' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
J
uni
o
C Hama
n
o
Merge branch 'mm
/
maint-do
c
-rem
o
t
e-tra
c
k
ing' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge branc
h
'rs/branc
h
-del-symref
'
into maint
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio
C
Hamano
Merge branch 'nd/grep-true-path' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C
H
amano
M
erge branch 'jc/gr
e
p-pc
r
e-loose
-
e
n
ds' (
e
arly
p
art
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
J
unio
C
Hama
n
o
Merge br
a
n
c
h 'da/mergetools-p4
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C Ha
m
a
n
o
Merg
e
branch 'jc/
t
e
s
t-say-color
-
a
v
oid-echo-escape
'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Hamano
M
e
rge branc
h
'
bw/
c
o
n
fi
g
-lift-
v
ariable
-
n
a
me-
l
ength-limit
.
.
.
commit
|
commitdiff
|
tree
2012-11-15
J
u
n
io
C
Hamano
S
t
art 1
.
8
.
1 c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-15
J
unio
C
Hamano
Mer
g
e branch 'jc/prettier-p
r
e
t
ty-not
e
'
commit
|
commitdiff
|
tree
2012-11-15
Junio C Hamano
Merg
e
b
r
anch 'mg/maint-pull-suggest-
u
pstr
e
am-to
'
commit
|
commitdiff
|
tree
2012-11-15
Junio
C Ha
m
ano
Merge branc
h
'mh/no
t
es-string-
l
ist'
commit
|
commitdiff
|
tree
next