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: add comments to clarify what these functions are doing
2012-12-26
Junio C Ha
m
an
o
merge-tree: add com
m
ents to cl
a
r
i
fy w
h
at these
func
t
ions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Ju
n
io C Hamano
merge-tree: l
o
se unu
s
ed "resolve
_
directories"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Ha
m
ano
merge-tree:
los
e
un
u
sed "f
l
ags
"
f
ro
m
m
erge_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-10
Junio
C Hama
n
o
Which merge_file() f
u
n
ction do you
mean?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
Junio C Ham
a
no
M
e
rge
b
ranch 'mm/status-push
-
pull-advise'
commit
|
commitdiff
|
tree
2012-12-03
J
u
nio C Hamano
Git 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 branc
h
'
mm/status-pu
s
h-
p
u
l
l-ad
v
ise'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Upda
t
e draft
r
elea
s
e notes to
1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hamano
Merge branch 'pw/p4-
v
arious-
f
ixe
s
'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C
Hamano
Merge b
r
anch 'lt/diff-sta
t
-show-0-lines'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
a
no
Merge branch 'fc/remote-h
g
'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C
Ham
a
no
Merge branch 'mk/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C H
a
mano
Mer
g
e
b
ranch 'jc/do
c
-push-satellite'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merg
e
branch 'km/send
-
em
a
il-remove-cruft-in-address'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'j
k
/
s
e
nd-
e
mail-sender-prompt'
commit
|
commitdiff
|
tree
2012-11-29
J
uni
o
C Haman
o
Me
r
g
e branch 'fc/send-email-no-sender-promp
t
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch
'er/doc-add-n
e
w-commands'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch
'
jl/submodule-rm'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
e
rg
e
branch 'pp/gitweb-
c
onfig-unders
c
ore'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'f
c
/
complet
i
on-
t
est-si
m
plification'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C Hamano
Merg
e
branch 'mas
t
er'
o
f
g
i
t://github
.
com
/
g
i
t-l
1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C
H
amano
t
4
049: refocus tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
H
amano
Merge
branch 'master' of git://git
h
ub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o
C H
a
mano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Update
d
raft release not
e
s to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ha
m
ano
Merge branch 'fc/
z
s
h
-com
p
l
etion'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
Mer
g
e branch 'mm/status
-
push
-
pull-advi
s
e'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge branch 'jk/pic
k
axe-textconv'
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C
H
a
mano
Star
t
pr
e
paring for 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/maint-gi
t
web-highlight-ext' into maint
commit
|
commitdiff
|
tree
2012-11-28
J
uni
o
C Hama
n
o
Merge
b
ranch 'pw/maint-p4-rcs-exp
a
nsion-
n
ewline' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C H
a
mano
Merge branch 'fc/send-email-no-send
e
r
-
prompt' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C H
a
mano
Documentation/git-push
.
txt: clarify the "push from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
u
n
io C Hamano
diff --
s
h
ort
s
t
at
:
d
o
n
ot count "unm
e
rged
"
ent
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
u
n
i
o
C
H
amano
Merge branch
'ma
i
nt
'
commit
|
commitdiff
|
tree
2012-11-27
Junio C Haman
o
M
e
rge
branch 'nd/maint
-
compat-fnmatch-fi
x
'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge branch 'jh/
u
pdate-re
f
-d-through
-
s
ymref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
amano
Merge branch 'esr/maint-doc-fast-import' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-11-27
J
u
ni
o
C Hamano
Merge
br
a
nc
h
'wtk/submodule-doc-fi
x
up' into
m
aint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
d
i
ff
-
-stat: do n
o
t c
o
unt "un
m
erged" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
un
i
o
C
Hamano
d
iff --stat: move
the "total
c
o
u
n
t" logic t
o
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 "fil
e
" t
e
mporary variable to ref
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C
Hamano
diff --sta
t
: s
t
atus of unm
o
dified pair in diff-q is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
un
i
o C Hamano
test: a
d
d faili
n
g tests for "diff --sta
t
"
t
o t4
0
49
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2012-11-26
J
unio C Hamano
Up
d
ate draft relea
s
e
no
t
es to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
mano
Merge b
r
a
nc
h
'
rr/submodule-diff-
c
onfig
'
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C
H
a
mano
Merge
b
r
a
nch 'nd/mai
n
t
-
compat-fnmatch
-
fix'
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C H
a
ma
n
o
Merge branch 'bc/do-not-rec
u
rse-
i
n-die'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
Merge
branch 'mk
/
com
p
lete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
no
Merge br
a
nch
'
j
h/update
-
ref-d-
t
h
r
o
ugh-symref'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'lt/diff-stat-sh
o
w-0-lines'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branc
h
'sg/complete-hel
p
-und
u
p'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Hamano
Sync with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
J
unio
C
Hamano
Git 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
Merge
b
ranch 'j
k
/checko
u
t-out-of
-
unbo
r
n' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge bran
c
h 'cn/config-m
i
ss
i
ng-path' i
n
to maint
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch
'
jk
/
maint-gitweb-xss' into maint
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Update
draft
release notes for 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio C H
a
m
ano
M
erge branch '
e
sr/maint-doc-fast-impo
r
t
'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge branch 'wtk/sub
m
od
u
le-doc-fixup'
commit
|
commitdiff
|
tree
2012-11-21
J
u
nio
C
H
a
mano
Merge branch 'so/prompt-command'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge branch 'j
k
/confi
g
-igno
r
e-duplicates'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge
b
r
a
n
ch '
j
k/maint-http
-
h
alf-aut
h
-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C H
a
mano
Sixth batch
f
or
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio C
Hamano
Merge branc
h
'ml/
c
ygwin-mingw-headers'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ham
a
no
Merge
branch 'jk/checko
u
t-out-of-unborn'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C Ha
m
ano
Merge branch
'
cn/config-missing-path'
commit
|
commitdiff
|
tree
2012-11-20
J
u
n
io C Hamano
Merge branch 'jl
/
su
b
module
-
rm'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C Hamano
Merge
bran
c
h 'm
g
/rep
l
ace-resolve-delete'
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C Ha
m
a
n
o
Merge bran
c
h 'jk/
m
aint-g
i
tweb-
x
ss
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'rh/maint-gitweb-highlight
-
ext'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C H
a
mano
Merge branch 'pw/m
a
i
n
t-p
4
-rcs-expansion-newline
'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C
Ha
m
ano
Merge bran
c
h 'mh/alt-odb-string-
l
i
s
t-
c
leanup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hama
n
o
M
er
g
e bran
c
h 'ta/doc-cleanup
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merg
e
branch
'kb/pre
l
oad-
i
ndex
-
m
o
re'
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C Ha
m
ano
Me
r
ge branch 'j
k
/mai
n
t-http-half-a
u
th-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Sync
w
ith maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hama
n
o
Further preparation
f
or 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio C
Hamano
Me
r
ge bra
n
ch
'mg/maint-p
u
ll-suggest-up
s
tream-to'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Hama
n
o
Merge br
a
n
ch 'mm/maint-doc-commit-edit' int
o
maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge
b
ranch
'
as/m
a
i
n
t-d
o
c-fix-no
-
post-rewrite
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge
branch
'rs/lock-correct-ref-du
r
ing-delete
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Haman
o
Merge branch '
r
f
/
maint-mailmap-off-by-one' into
maint
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C H
a
mano
Merge branch
'
jk/main
t
-dif
f
-gr
e
p-textconv
'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C
Hamano
Merge b
r
anch 'js/format-2047
'
into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Sync with
mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Hama
n
o
Start preparing
for 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-19
J
u
n
i
o C H
a
m
a
n
o
M
erge branch 'sz/maint-cur
l
-mul
t
i-timeout' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Me
r
ge branch 'po/mai
n
t-refs-repl
a
ce-doc
s
' int
o
maint
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C Hamano
Merge branch 'ph/pull-rebase-detached' into mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C Haman
o
Merge branch 'mm/maint-doc-
r
emote-tracking' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge branch 'rs/bra
n
ch-del-
s
y
mre
f
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge branc
h
'nd/grep-tr
u
e-pat
h
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Hamano
Mer
g
e bra
n
ch 'jc/grep-p
c
re-l
o
os
e
-ends'
(early p
a
r
t
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Junio C
Hamano
Merge branch 'da/mer
g
etools-p4' into maint
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio C Hamano
Merg
e
branch 'jc/te
s
t
-
say-color-a
v
oid-echo-escape
'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Jun
i
o C
H
a
m
a
n
o
Me
r
ge br
a
nch 'b
w
/config-lift-variable-name-length-lim
i
t
.
.
.
commit
|
commitdiff
|
tree
2012-11-15
Junio C H
a
mano
Sta
r
t 1
.
8
.
1 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next