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
Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
2012-12-26
Junio
C Hamano
mer
g
e-tree: fix
d
/
f conflic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Ha
m
ano
m
e
rge-tree: add comments to clarify wha
t
t
hese functions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C H
a
mano
merge
-
tree: lose u
n
used
"res
o
l
ve
_
dire
c
tories"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio
C
Hama
n
o
me
r
ge-tre
e
: lose unused
"
flags"
f
rom merge_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-10
Juni
o
C
Hamano
W
hich merge_fil
e
() function do you me
a
n
?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
Junio C
H
amano
Merge
b
ranch 'm
m
/s
t
atus-push-pull-advise'
commit
|
commitdiff
|
tree
2012-12-03
Junio C Ham
a
no
G
it 1
.
8
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Junio C Hamano
Mer
g
e branch 'mm/statu
s
-p
u
sh-pu
l
l-
a
d
vise'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Upd
a
te dra
f
t release n
o
t
es to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
J
unio C H
a
mano
Merge branch 'pw/p4-various-fixes'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
aman
o
Merge branc
h
'l
t
/
diff-s
t
a
t
-show-0
-
line
s
'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C Hamano
M
e
rge bran
c
h 'fc/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hama
n
o
Merge branch
'mk/
c
ompl
e
te-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C
H
am
a
no
Merge branch 'jc/doc-push
-
satellite'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hamano
Merge branch
'km/send-email
-
r
e
move-c
r
uft-in-address'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Haman
o
Merge branch 'jk/send-email-se
n
der-prompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'fc/s
e
nd-email-no
-
se
n
der-p
r
ompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hamano
M
e
rge branch '
e
r/doc-add-new-c
o
mmand
s
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Ha
m
ano
Merge branch
'jl/submodule-rm
'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C Hama
n
o
Me
r
ge branc
h
'p
p
/gitweb-conf
i
g-
u
nde
r
score'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C Hamano
Merg
e
branc
h
'fc
/
compl
e
tion-test
-
simplific
a
tion'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merg
e
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
H
amano
Merge
branch 'master' o
f
git://github
.
co
m
/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C Ha
m
ano
t4049: refocus t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hamano
Merge bran
c
h 'mas
t
er'
of git:/
/
github
.
com/g
i
t-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io C Hamano
Merge b
r
anc
h
'main
t
'
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C Hamano
U
p
d
a
te d
r
aft release notes to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
J
u
nio C
Ha
m
a
n
o
Merge branch
'
fc/zsh-c
o
mpletion'
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C
H
amano
M
erge branch 'mm/sta
t
u
s-pu
s
h-pull-advise'
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Hamano
Merge br
a
nc
h
'jk/pickaxe-
t
extconv'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Start preparing fo
r
1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Hamano
M
erge
b
ranch
'rh/maint-gitweb
-
highlight-ext
'
into maint
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Me
r
g
e
branch 'pw/mai
n
t-p4-rcs-expa
n
sion-n
e
wlin
e
' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C
Hamano
Me
r
ge branch 'fc/send
-
e
m
ail-no-s
e
nder-prompt' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C Hamano
D
o
cumenta
t
ion
/
git-push
.
txt: clarify t
h
e
"push from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
unio
C Hamano
d
i
ff
-
-
shortsta
t
: d
o
no
t
count "unmerged"
entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio
C
Hamano
M
e
rge branch 'nd/maint
-
co
m
p
a
t-
f
n
match-
f
i
x
' into maint
commit
|
commitdiff
|
tree
2012-11-27
Junio
C
Hamano
Merge b
r
anch '
j
h
/
update-
r
ef-d-through-symref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio C H
a
man
o
Merge
branch 'esr/m
a
int-doc-fast-impor
t
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio C
H
amano
Merge branc
h
'wtk/submodule-doc-fixup' into
m
ain
t
commit
|
commitdiff
|
tree
2012-11-27
J
unio C Hamano
di
f
f -
-
stat: do not count "unmerged" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
unio C
Ha
m
a
n
o
diff --stat: move the "total coun
t
" logi
c
to the last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Haman
o
diff --stat:
u
se "file" temporary var
i
abl
e
to r
e
fer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
unio C Hamano
d
iff --
s
tat: status of unmodified pair
i
n
dif
f
-q is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Hamano
t
e
st: add
f
ailin
g
tests for "diff --stat" to
t
4
0
49
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge br
a
nch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
ano
Update draft re
l
ease
n
otes to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Me
r
ge
b
ranch 'r
r
/sub
m
odul
e
-
d
iff-conf
i
g'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Me
r
ge bra
n
ch 'nd
/
m
aint-compat
-
f
n
match-fix'
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C
Haman
o
Merge branch
'
bc/do-not-recurse-in-d
i
e'
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o C Ha
m
ano
Merge branch 'mk/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
M
e
rge branch 'jh/update-ref-d-
t
hrough-symref'
commit
|
commitdiff
|
tree
2012-11-26
J
unio C
Hama
n
o
Merge branch 'lt
/
diff-sta
t
-
show-0-lines'
commit
|
commitdiff
|
tree
2012-11-26
J
u
n
i
o C Hamano
M
er
g
e branch '
s
g
/
c
omplete-he
l
p-undup'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Sync with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Git 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'jk/
c
heckout-out-of-unborn' into maint
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'c
n
/con
f
ig-missing-
p
ath'
i
n
to
m
a
int
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C Hamano
Merge branch 'jk
/
maint-gitweb-xs
s
' in
t
o maint
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hama
n
o
Update dra
f
t release n
o
t
e
s
for
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Ju
n
io C
H
a
mano
Merge b
r
a
nch
'
esr/mai
n
t-doc-fast-import'
commit
|
commitdiff
|
tree
2012-11-21
J
u
nio C Hamano
Mer
g
e branch 'wtk/subm
o
dule-doc-fixup'
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
Hamano
Merge
b
r
a
nch
'so/p
r
ompt-command'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Haman
o
Merge branch 'jk/config-i
g
nor
e
-duplica
t
e
s
'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Mer
g
e bran
c
h
'jk/ma
i
nt-h
t
tp-h
a
lf-a
u
t
h
-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Junio C
H
a
mano
Sixth batch for 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C Hamano
Merg
e
branch 'ml/cyg
w
i
n
-
mingw-h
e
a
ders'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ha
m
ano
Merge bran
c
h 'jk/che
c
kout-out
-
of-unb
o
rn'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
e
rge
b
ranch '
c
n/config-m
i
ssing-path'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C Hamano
Merge br
a
n
c
h 'jl/submodule-
r
m'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Hamano
Mer
g
e branch
'
m
g
/
r
eplace-resolve-delete'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hama
n
o
M
erge branch
'jk/maint-gitweb-xss'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'r
h
/
maint-git
w
eb
-
high
l
ig
h
t-ext'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C
H
a
m
ano
Merge
branch
'
pw/main
t
-p4-rcs-expans
i
on-ne
w
l
ine
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C
H
amano
Merge b
r
anch 'mh/alt-o
d
b
-
string-list-cleanup'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C
Ha
m
ano
Merge
branch
'
ta/doc-c
l
eanup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Mer
g
e branch 'kb
/
prelo
a
d-inde
x
-more
'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Hamano
Merg
e
br
a
nch
'jk/maint-http-half-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hama
n
o
Syn
c
w
ith main
t
commit
|
commitdiff
|
tree
2012-11-20
Junio C
Hama
n
o
Further preparation for
1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io
C
Hama
n
o
Merge branch 'mg/maint-pu
l
l
-suggest-upstream-to' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C H
a
m
a
no
Merge branch
'
mm/ma
i
nt-
d
o
c-com
m
it-edi
t
' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-20
Junio C
Haman
o
Merge branc
h
'as/main
t
-
d
o
c-fix
-
no-post-rewrite'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C
Hamano
Merge
branch
'
r
s/lock-c
o
rrect-ref-d
u
r
ing-delete' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C H
a
mano
Mer
g
e br
a
nch 'rf/maint-ma
i
lma
p
-off-by-on
e
'
into maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge
b
ranch 'jk/maint-diff-gre
p
-
textconv' into maint
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C Ham
a
no
Merg
e
bran
c
h 'js/format
-
2
0
47' into
maint
commit
|
commitdiff
|
tree
2012-11-19
Junio
C Hamano
Syn
c
w
i
th maint
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C H
a
mano
Start
p
reparing for 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C Hamano
Me
r
g
e
branch 'sz
/
ma
i
nt-curl-multi-tim
e
o
u
t
'
i
n
to
m
a
int
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C Hamano
Merge branch 'po/m
a
int-refs-replace-docs' into maint
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C Hama
n
o
Mer
g
e
b
r
a
nch
'
p
h/pull-rebase
-
de
t
a
c
hed' into maint
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C
Hamano
Merge bra
n
c
h
'
mm/maint-doc-remote-t
r
acking' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio
C Hamano
Merg
e
bra
n
c
h
'rs/branch-del-s
y
mref' in
t
o m
a
int
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C H
a
mano
Merge
b
ranc
h
'n
d
/g
r
ep-true-path' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
M
e
rge bra
n
c
h 'jc/grep-
p
c
r
e-l
o
ose-en
d
s' (e
a
rly
p
a
rt
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Ham
a
no
M
e
r
g
e branch 'd
a
/mergetools-
p
4'
into maint
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C
Ham
a
no
Merge
b
ranch 'j
c
/test-say-color-
a
void-echo-e
s
cape
'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio C Hamano
M
erge
b
r
anch 'bw/con
f
ig-lift-
v
ariabl
e
-name
-
length-limit
.
.
.
commit
|
commitdiff
|
tree
next