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: teach -Xours/-Xtheirs to binary ll-merge driver
2012-09-09
Junio C Hamano
me
r
ge
:
teach -Xou
r
s/-Xt
h
eirs
t
o binary ll-merge
drive
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
a
no
Sync with
1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Ham
a
no
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merge branch 'maint
-
1
.
7
.
8' in
t
o maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
J
u
ni
o
C H
a
mano
Merg
e
br
a
nc
h
'jc/maint-verify-objects-remove-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'dw/gitweb-doc-grammo'
into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'tr
/
cach
e
-tree' into
m
ain
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'cb/
m
ain
t
-t
5
54
1
-make-server-
p
or
t
-por
t
able
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hama
n
o
M
e
r
g
e
b
r
anch 'cn/maint-
r
e
v-list-
d
oc' into
m
a
i
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o
C
H
a
mano
Merge branch
'
tr/
m
a
i
n
t
-
b
u
ndle-boundary' into m
a
in
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
n
io C Hamano
Me
r
ge branch
'
tr/maint-bundle-long-subject'
into
m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hama
n
o
Mer
g
e bran
c
h 'ph/rerere-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C
Hamano
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Juni
o
C
H
amano
Merg
e
branch 'jc/
m
ai
n
t
-merge-a
u
toedit' into
ma
i
n
t
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o
C
Ham
a
no
Gi
t
1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C H
a
ma
n
o
Merge branch 'jn/maint-fas
t
-import
-
em
p
ty
-
ls' into
m
aint
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C H
a
mano
Merge b
r
a
n
ch 'ph/rerere-d
o
c' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-26
Juni
o
C Hamano
Mer
g
e
branch 'ms/m
a
int-config-e
r
ror-at-eol-
l
inecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'mai
n
t-1
.
7
.
8' into
m
aint
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
merge: back
p
ort
GI
T
_MERGE_AU
T
OEDIT sup
p
ort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Haman
o
Merge bra
n
ch 'k
s
/sort-wildcard-i
n
-makefile
'
in
t
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C Hamano
Merge
bran
c
h 'jc
/
a
d
vise-i18n' into maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ha
m
an
o
Merge b
r
anch 'j
n
/gitwe
b
-unspec
i
fi
e
d-action' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Ju
n
io C Hamano
f
e
t
ch/receive: remove over-pes
s
imis
t
ic connectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
amano
G
it 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Me
r
ge bra
n
c
h '
t
r/m
a
i
nt-bundle-boundary' into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branch
'
jc/maint-diff-patch-header'
i
nto
maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merg
e
branch 'jn/maint-do-not-match
-
with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branc
h
'jc/am-3-nons
t
andard-popt' into maint
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hama
n
o
Me
r
ge branch 'main
t
-1
.
7
.
8' into
m
aint
commit
|
commitdiff
|
tree
2012-03-06
Juni
o
C Hamano
M
erge branch 'maint-1
.
7
.
7
' into maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hamano
Git 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Ha
m
ano
Me
r
g
e branch
'jc/doc-me
r
ge
-
o
ptio
n
s' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
e
rge br
a
nch
'
cn/
m
aint-rev-list-doc' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Upd
a
te
draft release n
o
tes to 1
.
7
.
9
.
3
f
or the
last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
i
o
C Hamano
Merge branch 'cn/maint-branc
h
-with-bad' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge br
a
nch 'jn/maint-gitweb-
i
nva
l
id-regex
p
' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Ha
m
ano
Merge branch 'nd/mai
n
t-verify-object
s
' into
m
aint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
Merge branch 'jk/
m
aint-avo
i
d-streamin
g
-
fil
t
ered
-
con
t
ents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o
C
Hamano
M
erge branch 'jb/f
i
lter-ignore-s
i
g
p
ipe' into main
t
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Hamano
Merge b
r
anch 'sp/s
m
art
-
http-failu
r
e-to-push' into maint
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C H
a
m
a
no
Merge branch 'tr/maint-
b
un
d
le-
l
ong-subject'
i
n
to maint
commit
|
commitdiff
|
tree
2012-03-02
Junio C Ham
a
no
D
o
cume
n
tat
i
on: do not assume t
h
a
t n
>
1 in <rev>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
d
if
f
-p:
s
quelch
"
diff
-
-git" h
e
ader for sta
t
-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4011: illustrate "diff-inde
x
-p" on s
t
at-di
r
ty pat
h
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
J
unio C Hamano
t4011: modernise
s
tyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
unio C
Hamano
Update draft releas
e
no
t
e
s to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merg
e
b
r
anch 'pj
/
remote-set-branches-usage-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge b
r
an
c
h 'j
n
/gitweb-unborn-head' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
Merge branc
h
'jn/ancient-meld-support' into maint
commit
|
commitdiff
|
tree
2012-02-27
J
unio C
H
a
m
ano
Merge br
a
n
c
h
'tr/merge-edit-guida
n
ce
'
into maint
commit
|
commitdiff
|
tree
2012-02-27
J
unio C H
a
mano
test:
"am -3" c
a
n accept non-s
t
andard -p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hamano
Document accumulated fixes si
n
ce
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C H
a
mano
M
e
r
ge branch 'j
c
/add-re
f
resh
-
unmerged'
i
n
to maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Ha
m
ano
Merg
e
branch
'
j
s
/configure-libintl' i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Hamano
Sync
with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Hamano
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Haman
o
Document
mer
g
e
.
branchdesc configuration variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Hamano
am -3:
a
llo
w
n
onst
a
n
dar
d
-p<num> opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C
Hama
n
o
Gi
t
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-22
Junio C Hamano
Docum
e
ntation/merge-options
.
txt: group "ff" r
e
late
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
U
p
date
dra
f
t
r
elea
s
e notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C
Hama
n
o
Merge br
a
nch 'cb/receive-
p
ack-keep-errors' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ha
m
ano
Merge branch 'cb/transfer
-
no-pro
g
r
ess
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branch 'jk/git-dir
-
lookup' into
m
aint
commit
|
commitdiff
|
tree
2012-02-21
J
unio
C
H
amano
Mer
g
e branch '
j
c/diff-stat-scale
r
' into maint
commit
|
commitdiff
|
tree
2012-02-21
J
u
n
i
o C Hamano
M
e
rge
b
r
a
nch
'zj/
t
erm-columns' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge b
r
a
nch 'cb/maint-rev-list-verify-object
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
J
u
nio C H
a
ma
n
o
M
erge branch 'cb/
m
aint-
t
5541-m
a
k
e-se
r
ver-port
-
portable
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
J
unio C
H
a
m
ano
Me
r
g
e bra
n
ch 'd
p
/i18
n
-libcharse
t
' into
maint
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C
H
a
mano
Merge
b
ranch '
j
k/gr
e
p-
b
inary-
a
ttribute'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge b
r
anch
'
nd/diffstat-gramnum' int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C H
a
mano
Merge branch 'nd/find-pack-entry-recent-cache-invalid
a
tion
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C Hamano
Merge bra
n
ch 'tt
/
profile-build-fix' into maint
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C
Hamano
Merge branch 'fc/zsh-completion' into maint
commit
|
commitdiff
|
tree
2012-02-20
J
unio
C Ha
m
ano
U
p
date draft release notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-17
Juni
o
C Hamano
refr
e
sh_i
n
d
ex: do
not sh
o
w unmer
g
ed path that is ou
t
side
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio
C Hamano
Updat
e
draft
releas
e
notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
J
u
ni
o
C Hamano
Me
r
ge br
a
n
ch 'jc
/
checko
u
t-out-of-unborn' i
n
t
o maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
Ham
a
no
M
e
rge branch 'jc/maint-mailmap-output' into maint
commit
|
commitdiff
|
tree
2012-02-16
Jun
i
o C Hamano
Me
r
ge branch 'jk/p
r
ompt-fall
b
ack-to-tty'
int
o
m
aint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge branc
h
'jn
/
g
i
t
w
e
b
-search-ut
f
-8' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Me
r
ge branch 'jc/maint-commi
t
-i
g
nore-i-t-a' into maint
commit
|
commitdiff
|
tree
2012-02-16
J
u
nio C H
a
mano
M
e
rge br
a
nc
h
'mm/e
m
pty-loose-
e
rror-messag
e
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
M
erge
b
ranch
'
n
k
/
c
t
ype-for-perf' into mai
n
t
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Me
r
ge branch 'jx/i1
8
n-more-marking'
i
n
t
o
main
t
commit
|
commitdiff
|
tree
2012-02-16
J
u
n
io C Ham
a
no
M
erge branch 'rt/completion-branch-ed
i
t-desc' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
diff
-
-stat: sh
o
w ba
r
s of same
l
e
ngth
f
or paths with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
J
u
nio C
Ham
a
n
o
Git 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Junio
C
Haman
o
Merge branch
'jk/maint-tag-show-f
i
x
e
s' i
n
to main
t
commit
|
commitdiff
|
tree
2012-02-14
Junio
C
Hamano
Merge branch 'bw/inet-pton-ntop-com
p
at
'
into maint
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge
bran
c
h 'mp/make-cleanse-
x
-for-exe' int
o
maint
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge
b
ranch 'jn/m
e
rg
e
-n
o
-edit-fix' into
maint
commit
|
commitdiff
|
tree
2012-02-13
Jun
i
o
C
Hamano
U
p
da
t
e
draft relea
s
e
note
s
to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-13
Junio C
Ham
a
no
Merge b
r
anch 'j
s
/add-e-submodu
l
e-fix
'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-13
Ju
n
io C
Hamano
Mer
g
e branch 'jc/parse-da
t
e-raw' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C
Hamano
Merge branch '
j
c/
m
erge-ff-o
n
l
y-stronger
-
than-signed
.
.
.
commit
|
commitdiff
|
tree
next