repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
apply: allow rerere() to work on --3way results
2012-07-09
Junio
C
Hamano
app
l
y:
a
llow rerere() to w
o
rk on --3way r
e
sults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: register c
o
nfli
c
te
d
stages t
o
t
h
e
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --3way with add/add conf
l
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: move verify_index_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
a
p
ply: plug
the th
r
ee-way
m
erge l
o
gic
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
ap
p
ly: fall ba
c
k on
t
hr
e
e-
w
ay m
e
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
apply: accept
-
3/--3way command
li
n
e option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: move
"already
e
xists"
l
ogi
c
to check_to
_
create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
appl
y
: move
c
hec
k
_
t
o
_cr
e
ate_blob() closer to
it
s
so
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly:
f
u
rther
s
pl
i
t load_prei
m
age()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: ref
a
c
tor "pr
e
v
ious patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: split lo
a
d_preimag
e
() helper func
t
ion out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
ap
p
ly: factor out ch
e
ckout_target() helper f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
apply: refactor
r
ead_fil
e
_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply:
c
lea
r
_image() cle
a
rs things a bit
m
ore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
appl
y
:
a
bit m
o
re comm
e
nts on PATH_TO_BE_D
E
LETE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
apply: fix an incomplete
comment
i
n c
h
e
ck_patch
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Ham
a
no
The
nin
t
h
bat
c
h of top
i
cs
gra
d
u
ated to
'
master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Merge br
a
nch
'
nh
/
emp
t
y-re
b
ase'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch 'z
j
/diff-empty-ch
m
od'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
M
e
rge branch 'jk
/
maint-tforma
t
-with-z'
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-07
Junio C Haman
o
Mer
g
e branch 'th/di
f
ft
o
ol-diffall'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Sy
n
c with
maint
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Ha
m
ano
Start
p
reparing
fo
r
1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Me
r
ge branch 'jk/ma
i
n
t
-gitweb
-
test
-
use-
s
ane-perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Ha
m
a
n
o
Me
r
ge branch 'js/d
a
em
o
n-
t
est-race-fix' into maint
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Ham
a
no
Mer
g
e bran
c
h 'jk/mai
n
t
-config-bogus-
s
e
ction'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
M
e
rge bra
n
ch 'pw/t5800-import-r
a
c
e
-fix' into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ha
m
ano
Me
r
ge branch 'rt/
c
herry-revert
-
conflict-summary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C
Hamano
Merg
e
branch
'
c
b
/maint-repo
r
t-
m
ount-
p
oint-correct
l
y
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Pete Wyckoff
git p4 doc: f
i
x f
o
rmatt
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-04
Nguy
ễ
n T
h
ái Ngọc Duy
Makefile: keep m
a
ny variabl
e
list sorted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
Neil
H
orman
git cherry-pick: do not dereferen
c
e
a potential NULL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C
Hamano
Me
r
ge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
H
amano
M
e
rge branch 'jc/merge-reduce-parents-ear
l
y' into maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
M
e
rge branch 'cb/che
r
ry-pi
c
k-
r
e
v-
p
ath-con
f
usion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ham
a
n
o
M
erge
b
ra
n
ch 'cb
/
http-mu
l
ti-
c
url-auth' into maint
commit
|
commitdiff
|
tree
2012-05-03
Junio
C Hamano
Merge
b
ranch 'mb/fetch-call-a-non-branch-
a
-ref' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Hamano
Merge br
a
nch 'rl/maint
-
stash
-
i18n-sa
v
e-error' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge br
a
nch 'j
m
/
m
a
i
n
t-strncpy
-
diff-no-index' into
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
J
un
i
o
C
Hamano
Merge branch 'jk/maint-pus
h
-progress'
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C Hamano
Merge bran
c
h 'n
d
/columns'
commit
|
commitdiff
|
tree
2012-05-03
Jeff K
i
ng
doc/config:
f
ix inline litera
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
man
o
The eighth
ba
t
c
h of topic
s
g
raduated to 'm
a
ster'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
J
unio C H
a
mano
Merge branch 'master' of git://g
i
t
.
bo
g
omips
.
o
r
g/g
i
t-svn
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
H
a
ma
n
o
Mer
g
e br
a
nch
'
tr/xdiff-fast
-
hash'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge bran
c
h 'jk/maint-
g
i
twe
b
-tes
t
-use-sane
-
perl'
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hamano
Merge bra
n
ch 'pw/me
s
sage-cl
e
anup'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C H
a
mano
Mer
g
e
branch 'zj
/
diff-
s
tat-smaller
-
n
u
m-columns'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C Hamano
Merge
b
ranch 'pw/
p
4-various'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
i
o
C
Hamano
Merge b
r
a
n
c
h 'j
c
/rerere-train'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Ha
m
ano
Me
r
ge branch 'a
b
/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
Hamano
Merge branch 'lp/di
f
fstat-with-graph'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Merge branc
h
'
zj/mksh-co
l
u
m
ns
-
breakage'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge branch 'jk/doc-asciidoc-inli
n
e
-litera
l
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge br
a
nch 'nd/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hama
n
o
Merge b
r
a
nch 'mm/simple
-
push'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio
C Hamano
Me
r
ge branc
h
'jc
/
index-
v
4'
commit
|
commitdiff
|
tree
2012-05-02
Johannes
S
ixt
t
4
006: Window
s
do
n
o
t h
a
ve /d
e
v/zero
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Zbigniew Jędrzejewsk
.
.
.
di
f
f --stat: do not run diff
on indentical files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Zb
i
gni
e
w
Jędrzejewsk
.
.
.
diff --
s
tat: report
m
o
de-only c
h
anges for bin
a
ry file
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io
C Hamano
Merge branch 'master' of https://github
.
c
om/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Sync
w
i
t
h v
1
.
7
.
1
0
.
1
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Git 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Ha
m
a
no
Merge b
r
anch 'pw/fast-i
m
port-data
r
ef-parsing
'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Haman
o
Merge branc
h
'it/fetch-pack-many-refs' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merge branch 'jl/main
t
-submo
d
ule-recurse-fetch'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C
Hama
n
o
M
erge branch
'jc/maint-blame-min
i
mal' into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C Hamano
Merge branch 'lp/maint-diff-
t
hree-dash-with-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Mer
g
e
branch 'jk/rebase-
i
-submodul
e
-con
f
lic
t
-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge branch '
m
aint'
o
f
https://github
.
com/git-l10
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrzejewsk
.
.
.
C
o
n
sistently
u
se per
l
from /usr/bin/ for scr
i
pts
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Thoma
s
Rast
xdiff: choos
e
X
D
L_FAST_HASH code
o
n
sizeof(
l
on
g
)
instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Je
f
f
K
ing
t/gitweb-lib: use
$
PERL_PATH to
ru
n
gitweb
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zbi
g
niew
J
ę
d
r
z
ejewsk
.
.
.
te
s
ts: chec
k
--
[
short]stat
outp
u
t aft
e
r chmod
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Ję
d
rzejewsk
.
.
.
tes
t
: modernize style
o
f
t4006
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Junio C Hamano
lo
g
-tree:
the previous o
n
e
is stil
l
not quite right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jan Krüge
r
log-tree:
u
s
e cu
s
t
o
m li
n
e
terminato
r
in line termination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
t5
5
41: test more
combinatio
n
s of --progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Je
f
f King
te
a
c
h sen
d
-pac
k
ab
o
ut --[no-]progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff
King
send-pack: show pr
o
g
r
ess wh
e
n
i
s
atty
(
2)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete
W
yc
k
off
git
p
4:
s
u
b
mit files with wildcards
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pet
e
W
y
ckoff
git
p
4: fix writable file af
t
er r
e
name
o
r
copy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4: test
s
ubmit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p
4
: bring bac
k
files in deleted client di
r
e
c
tory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
remove blank filename in error
me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
P
e
t
e Wyckoff
remove superfluous newl
i
nes in
error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ham
a
n
o
M
erg
e
branch 'ld/g
i
t-p4-
t
ags-and-la
b
els'
commit
|
commitdiff
|
tree
2012-04-30
J
unio
C
Hamano
Merge br
a
nch
'
nh
/
empty-rebase'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio
C Hamano
Merge branch 'jk/maint-config-bo
g
us
-
section'
commit
|
commitdiff
|
tree
2012-04-30
Zbigniew Jęd
r
zejew
s
k
.
.
.
d
iff --stat: use
less column
s
for change counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
n
io C Hamano
contrib/rerere-train: use installed git-sh-setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Æ
var Ar
n
fjör
ð
B
j
ar
m
a
s
on
g
i
t-commit: rem
o
v
e
lego in i18n messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Æ
va
r
A
r
nfjörð Bjarmason
git
-
commit: remove
l
eg
o
in i18n messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjörð Bjarmason
g
it-branch: remove lego i
n
i18
n
messag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Ham
a
n
o
The seve
n
th batch
of
topics
gr
a
duated
to 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
ni
o
C Haman
o
Merge br
a
nch 'js/dae
m
on-te
s
t-r
a
ce-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch
'kk/gitwe
b
-om
i
t-expensive
'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch 'kk/maint-git
w
eb
-
missing-o
w
ner'
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Hamano
M
e
rge branch 'rs/commi
t
-
l
i
s
t-append'
commit
|
commitdiff
|
tree
next