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
J
unio C Ha
m
ano
Which m
e
rge_file() function
do you mean?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
Junio C Hamano
M
erge branch 'mm/st
a
tus-pu
s
h-
p
ull-advi
s
e'
commit
|
commitdiff
|
tree
2012-12-03
Junio C Ha
m
ano
Git 1
.
8
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Ju
n
i
o
C Hamano
Merge branch 'mm/sta
t
us-push-p
u
ll-ad
v
i
se'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C
H
amano
Upda
t
e d
r
aft release
n
ote
s
to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge b
r
anch
'
pw/p4-vario
u
s-fixes'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
e
rge b
r
an
c
h 'lt/
d
iff
-
stat-show
-
0-li
n
es'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
H
aman
o
Merge branch 'fc/
r
emote-hg'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hamano
M
erge
b
r
anch 'mk/co
m
plete-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C H
a
mano
Merge branch '
j
c
/
doc-push-satellite'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C
Hamano
M
e
rge branch 'km/sen
d
-email
-
re
m
ove
-
cruft-
i
n-address'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
amano
Merge
b
ra
n
ch '
j
k/send-email-s
e
n
der-pr
o
m
p
t'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
Mer
g
e
bra
n
ch
'
fc/send-emai
l
-
n
o
-
sender
-
prom
p
t'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C
H
amano
Merg
e
branch '
e
r/doc-add-new-com
m
ands'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
an
o
M
erge
b
ranch 'jl/submo
d
ule-rm'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
amano
Mer
g
e bran
c
h 'pp/gi
t
web-config
-
u
ndersc
o
re
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Me
r
ge
branch 'fc/compl
e
tion
-
te
s
t-simplification'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge
b
ra
n
c
h
'main
t
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge b
r
a
n
ch 'mas
t
er'
o
f git://github
.
com/git-l1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
t4049: refocus tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Ham
a
no
Merge b
r
anch 'm
a
s
t
e
r
'
o
f git:
/
/
github
.
com/git
-
l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io
C
Hamano
Update draft rele
a
se notes
t
o
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
J
u
nio C
H
am
a
no
Merg
e
branch 'fc/zsh-comp
l
etion'
commit
|
commitdiff
|
tree
2012-11-28
Junio C
Hama
n
o
Mer
g
e br
a
nch 'mm/sta
t
u
s
-
p
ush
-
pull
-
adv
i
se'
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io C Hamano
Merge branc
h
'jk
/
pickaxe-textco
n
v'
commit
|
commitdiff
|
tree
2012-11-28
J
u
n
io C Hama
n
o
S
t
art preparing
f
or 1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ha
m
ano
Merge br
a
nch 'rh/maint-gitweb-h
i
ghlight-
e
xt' int
o
main
t
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C
H
aman
o
Merge branch
'
pw/maint-p4-rcs-expansion-newli
n
e' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
J
u
nio C Ha
m
a
n
o
Me
r
ge branch 'fc/send-
e
mail-no-send
e
r-prompt
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io
C
Haman
o
D
ocumentation/git-push
.
txt: clari
f
y the
"
pus
h
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C
H
a
mano
di
f
f --shortstat: do not count "unm
e
rged
"
e
ntries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C Ham
a
no
Me
r
ge branch
'maint'
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Hamano
Merge branch
'
nd/maint-compat-fn
m
a
t
ch-fix'
into main
t
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C
Hamano
M
e
rge branch 'jh/update-ref-
d
-
t
hrough-symref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Me
r
ge branch
'
esr/m
a
int-doc-fast-import
'
into m
a
int
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge branch '
w
tk/submo
d
ule-doc-fixup'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Hamano
diff --stat: do not count "unmerged" en
t
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Ha
m
ano
diff -
-
st
a
t: move the
"to
t
al
count" log
i
c to the l
a
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ham
a
no
diff -
-
stat: use "
f
i
le" temporary va
r
iable to refer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio C Hamano
diff
-
-stat: st
a
tus of unmodified
p
air in di
f
f-q
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C
Ham
a
n
o
test: add
f
a
iling
tests for "diff --
s
ta
t
" t
o
t4049
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
ano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
H
amano
Update draf
t
releas
e
n
o
tes t
o
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C Hamano
Merge branch
'rr/su
b
module-dif
f
-
c
onfig'
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o C Hamano
Merge branch 'nd/maint-compat-f
n
m
a
tch
-
fix'
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C Ham
a
no
Merge branch
'bc/do-not-recu
r
se-in-d
i
e
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
M
e
rge b
r
anch 'mk/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
ano
Merge bran
c
h
'jh
/
upd
a
te-re
f
-d-through-symre
f
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Me
r
ge branch '
l
t/diff-stat-s
h
ow-0-line
s
'
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
i
o C Ha
m
ano
Merge
b
ranch 'sg/complete-help-undup'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
a
m
a
no
Sync
w
ith 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
no
Gi
t
1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Ha
m
a
no
Merge br
a
nch 'jk/che
c
kout-out-of-unborn
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
Merge b
r
anch 'cn/config-missing-
p
ath' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o
C Hamano
Merge bra
n
ch '
j
k/maint-gitw
e
b-xss'
into m
a
int
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Update dr
a
ft release n
o
tes f
o
r
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio C
H
ama
n
o
Merge branc
h
'esr
/
maint-doc-fast-impo
r
t'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Ham
a
no
Merge
branch 'wtk/s
u
bmodule-do
c
-fixup'
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
Hamano
Merge
b
ranch 'so/prompt-command'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hama
n
o
Merge branch '
j
k/confi
g
-ignore-
d
u
p
licates'
commit
|
commitdiff
|
tree
2012-11-21
Junio C
Hamano
Merge branch 'jk/maint-http-half-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
J
u
n
io C Haman
o
Six
t
h
b
atch for 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ha
m
ano
Mer
g
e b
r
anch '
m
l
/
cygwin-mingw-h
e
aders'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
i
o
C H
a
mano
Merge branch '
j
k/checko
u
t-
o
ut-of-unborn'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge bran
c
h 'cn/config-mis
s
i
n
g-path'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
H
a
mano
M
e
rge branc
h
'j
l
/s
u
bmodule-rm'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ham
a
n
o
Merge
b
r
anch
'
mg/rep
l
ace
-
resol
v
e-delete'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
e
rge
b
r
anch 'jk/mai
n
t-gitweb-xss'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ha
m
ano
Merg
e
branch 'rh/maint-git
w
eb-h
i
ghlight-ext'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Me
r
ge branch 'pw/maint-
p
4-rc
s
-expa
n
sion-newline'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C Hamano
Merge
branch
'
mh/al
t
-odb-s
t
ring-
l
ist-cleanup'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Ha
m
ano
Merge branch 'ta
/
d
oc-cle
a
nup'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C H
a
mano
Me
r
ge branc
h
'kb
/
preload-index-
m
ore'
commit
|
commitdiff
|
tree
2012-11-20
J
unio C Hamano
M
e
rge branch 'jk/
m
aint-
h
ttp
-
half-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Ha
m
ano
Sync w
i
th
maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Haman
o
Further prepa
r
a
t
i
on for
1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
J
unio C
Hama
n
o
Mer
g
e
b
ranc
h
'
mg/maint-pull
-
s
u
gges
t
-upstr
e
am-to
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Me
r
ge branch
'mm/maint-doc-commit-
e
dit' in
t
o maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
e
rge br
a
nc
h
'as/maint-doc-fix-
n
o-post-rewrite' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'rs/lo
c
k-
c
o
r
rec
t
-
ref-during-de
l
ete' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Ha
m
ano
M
erge bran
c
h
'rf/maint-mailmap-
o
ff-by-one' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C H
a
mano
Merge branch 'jk/m
a
int-d
i
f
f
-
g
r
ep-t
e
xtc
o
nv' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C Ha
m
a
no
Merge branch
'
js
/
format-2047
'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-11-19
Jun
i
o C Hamano
Sync
with ma
i
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio
C Hamano
Star
t
pre
p
aring for 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-19
J
u
n
io C H
a
m
ano
Merge branch 'sz/maint-cu
r
l
-multi-timeout' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge bran
c
h
'
p
o/main
t
-r
e
fs-replace-docs' int
o
m
aint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
M
e
rge
b
r
anch 'ph/pull-r
e
base-detached' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge
bran
c
h 'mm/m
a
i
nt-doc-remote-tracki
n
g' into
mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio
C
Hamano
Merge branch
'
r
s/branch-del-symref'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
M
erge branch 'nd/grep-true
-
p
a
th' into main
t
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C
H
a
mano
Merge br
a
nch
'
j
c/g
r
ep
-
p
c
re-loose
-
ends' (e
a
rly
p
ar
t
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hama
n
o
Merge br
a
nch 'd
a
/merg
e
tools-p4' into
maint
commit
|
commitdiff
|
tree
2012-11-19
J
u
n
i
o C Hamano
Merge bran
c
h 'jc/te
s
t-say-color-a
v
o
i
d-echo-escape'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio C Hama
n
o
Merge branc
h
'bw/c
o
nfig-lift-v
a
ri
a
ble-name-length-limit
.
.
.
commit
|
commitdiff
|
tree
2012-11-15
Junio
C
Haman
o
S
t
art 1
.
8
.
1 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-15
Ju
n
io
C Hamano
M
erge bran
c
h
'
jc/pr
e
ttier-pret
t
y-not
e
'
commit
|
commitdiff
|
tree
2012-11-15
J
unio C Ha
m
an
o
Merge bra
n
ch 'm
g
/m
a
int-pull-suggest-upstre
a
m-to'
commit
|
commitdiff
|
tree
2012-11-15
J
u
ni
o
C Hamano
Merge branch 'mh/notes-str
i
n
g-list'
commit
|
commitdiff
|
tree
next