repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'va/p4-branch-import-test-update'
2011-08-21
J
u
nio C Ham
a
no
c
o
m
b
i
n
e
-diff: support format_callback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-21
Fredrik Kui
v
ine
n
Use kwset in
gre
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-21
Fredr
i
k Kuivinen
Us
e
kwset in pick
a
xe
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-21
Fredrik Kuivi
n
e
n
Adapt th
e
kwse
t
code to Git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-21
Fredrik Kuivine
n
Add string search r
o
uti
n
es f
r
om GNU
g
rep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-21
Fr
e
drik
Kuivinen
Add
obstac
k
.
[ch] from EGLIBC 2
.
1
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
J
e
ff King
supp
o
rt pager
.
* for ex
t
e
rnal com
m
ands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
Jeff King
w
a
nt_color: automa
t
i
cally fallback to color
.
ui
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
Jeff King
diff: don't load
color c
o
nfig in plumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
Jeff King
conf
i
g
:
refactor get_
c
olor
b
ool function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
Je
f
f Kin
g
color: d
e
lay auto-color de
c
isi
o
n until po
i
nt of use
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
J
u
n
io C Ham
a
n
o
commit:
reduce us
e
o
f redund
a
n
t glo
b
al variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
N
guyễn Thá
i
Ngọc Duy
l
o
g:
deco
r
ate "r
e
p
laced" on to rep
l
aced
commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
Michael J Grub
e
r
bra
n
ch
.
c: use the parsed bran
c
h name
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Aguilar
mergetools/meld: Use
'
--ou
t
p
u
t'
w
hen available
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Agui
l
a
r
m
ergetool--lib: Refactor to
o
ls
into s
e
parate file
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib:
M
ake
style con
s
i
s
tent wit
h
git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
difftool--h
e
lper: Make style
c
onsisten
t
wit
h
git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
Junio C Hamano
Update
draft
r
elease notes to 1
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-19
J
unio C Hamano
Merge b
r
anch 'db/am-s
k
ip-
b
l
a
nk-at-the-beginning
'
commit
|
commitdiff
|
tree
2011-08-19
Junio C
Hamano
Merge branch 'ma/am-exclude'
commit
|
commitdiff
|
tree
2011-08-19
Junio
C
Hamano
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-08-18
Jef
f
King
git_c
o
n
fig_col
o
rboo
l
:
r
e
factor stdout_is_t
t
y han
d
li
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Jeff Ki
n
g
dif
f
: refactor C
O
LOR_
D
IFF from a flag int
o
an int
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
setup_pa
g
er: set GIT_
P
A
GER_IN
_
U
SE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
t70
0
6: u
s
e
t
e
st_co
n
f
i
g helpers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
t
e
st-lib: add helper functions for config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
t
7006: mo
d
ernize
c
al
l
s
t
o uns
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn T
h
ái Ngọc Duy
fetch-pack: check for
valid commit from serve
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn Th
á
i
Ngọc Duy
log:
decorate grafted commits wit
h
"
gra
f
ted"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Ngu
y
ễn Thái Ngọc Duy
Move wr
i
te_shallow_com
m
its
t
o
f
etch-pack
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
N
g
uy
ễ
n
T
há
i
Ngọc Duy
A
d
d for_each_commit
_
graft()
to ite
r
ate all g
r
a
ft
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn Thái N
g
ọ
c
Duy
dec
o
ration
:
do not
m
is-decor
a
te re
f
s with same
prefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Junio C
H
amano
U
pdate dra
f
t relea
s
e notes to
1
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-18
Junio C
H
am
a
no
Merge branch 'mh/check-attr-rel
a
tive'
commit
|
commitdiff
|
tree
2011-08-18
Junio
C
Hamano
Mer
g
e bran
c
h 'js/bisect-no-
c
heckout'
commit
|
commitdiff
|
tree
2011-08-18
Junio
C
H
ama
n
o
Merge
b
r
anch 'r
c
/histogram-di
f
f'
commit
|
commitdiff
|
tree
2011-08-18
Juni
o
C Hamano
Mer
g
e b
r
anch '
j
c/
m
a
int-smar
t
-
http-race-upload-pack'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
M
e
rge bran
c
h
'
js/sh-st
y
le'
commit
|
commitdiff
|
tree
2011-08-18
J
u
n
io C H
a
m
a
no
Merge branch
'
js/ref-namespaces'
commit
|
commitdiff
|
tree
2011-08-18
Jun
i
o C Hamano
Merg
e
branch '
c
b
/
maint-q
u
iet-push'
commit
|
commitdiff
|
tree
2011-08-18
Jun
i
o
C Hamano
Merge branch 'jc/ma
i
n
t-com
b
ined-
d
iff-work-t
r
e
e'
commit
|
commitdiff
|
tree
2011-08-18
Ju
n
io C Hamano
Mer
g
e
branc
h
'c
b
/mai
n
t-exec-error-r
e
por
t
'
commit
|
commitdiff
|
tree
2011-08-18
Junio C H
a
mano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Merge branch
'
r
c/
h
ist
o
gram
-
diff'
into
HEAD
commit
|
commitdiff
|
tree
2011-08-18
T
a
y R
a
y Chuan
x
d
iff/xprep
a
re: improve
O
(n*m) p
e
r
f
o
r
ma
n
c
e in
x
dl_clea
n
up_re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-17
Dmit
r
y Ivan
k
ov
doc/fast-im
p
ort: document fea
t
ure import
-
mark
s
-i
f
-
e
xists
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-17
N
guyễn Thái
Ngọc Duy
checkou
t
-index: remove
obsolete
comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Sync w
i
th
"maint"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-08-16
J
o
n
a
than Nieder
merge-r
e
cu
r
sive: ta
k
e adv
a
n
t
a
g
e
o
f
h
ar
d
c
o
d
e
d
empty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Prepare
f
or 1
.
7
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ha
m
a
n
o
Merge bra
n
ch 'jk/tag-list-multipl
e
-patter
n
s' int
o
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C H
a
mano
M
e
rge branc
h
'jl/
s
u
b
m
odule-updat
e
-quiet' int
o
maint
commit
|
commitdiff
|
tree
2011-08-16
Juni
o
C
H
a
ma
n
o
Merge branch 'jl/submod
u
le-add-relurl-wo-upst
r
eam'
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Juni
o
C H
a
mano
Merge branch 'oa
/
pull
-
r
eflog' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-08-16
J
unio C Hamano
Mer
g
e branch 'js/l
s
-tree-er
r
or
'
in
t
o
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C
H
amano
Me
r
ge branch 'jk/fast-exp
o
rt-quote-path
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-08-16
Jun
i
o C Hamano
Merge branch 'jc/c
h
ecko
u
t-
r
eflog-fix' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hama
n
o
Me
r
ge bran
c
h 'jc/ma
i
nt-reset-unmerged-path' int
o
maint
commit
|
commitdiff
|
tree
2011-08-16
J
unio C
Ha
m
ano
M
erg
e
b
r
anch '
m
z/doc-re
b
a
s
e-abo
r
t'
i
nto maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
n
i
o C Hamano
Merge bra
n
ch 'bw/log-all-re
f
-upd
a
tes-doc
'
into maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C Ha
m
ano
M
erg
e
branch 'js/mai
n
t
-add-pat
h
-stat-pwd'
int
o
maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
n
i
o
C
H
a
m
a
no
M
erge branch 'ms/help-unknown' i
n
to maint
commit
|
commitdiff
|
tree
2011-08-16
J
unio C Hama
n
o
Merge bran
c
h 'mz/doc-
s
ynopsi
s
-verse' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge br
a
n
ch 'j
n
/m
i
m
e-ty
p
e-with-para
m
s' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io C Hamano
Merge branch 'jc/
s
u
bmodule
-
sync-no
-
auto-
v
ivify' into
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io C Hamano
Merge branch 'jc/zlib-wrap' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C H
a
m
ano
M
e
rge bra
n
c
h
'fk/r
e
l
i
nk-u
p
on-ldflags-update
'
into
maint
commit
|
commitdiff
|
tree
2011-08-16
J
uni
o
C Ha
m
ano
Me
r
ge b
r
a
nch 'bc/submodu
l
e-fore
a
ch-stdin-f
i
x-1
.
7
.
4
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio C H
a
man
o
Merge branc
h
'aw/rebase
-
i-p' into
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge branch 'jc/dif
f
-in
d
ex-qu
i
ck-ex
i
t-early'
into
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge branch 'jk
/
combine-diff-binary-etc'
into mai
n
t
commit
|
commitdiff
|
tree
2011-08-16
J
eff
K
i
ng
am: refresh
t
he in
d
ex
at
s
tart and
-
-
r
esolved
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-16
Jonathan Nieder
re
v
ert: plug memory l
e
ak in "che
r
r
y
-pick root commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
M
i
c
hael Haggerty
Unr
o
ll the l
o
op
over
passes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Michael Haggerty
C
h
ange wh
i
le
l
oop into
f
o
r loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Michael Hagger
t
y
Determine the sta
r
t o
f
the
s
tates o
u
tsi
d
e of the pass
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Michael Ha
g
gerty
Change pars
e
_attr() to take a pointer
t
o
st
r
uct att
r
_state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
M
i
c
h
ael Haggerty
In
c
re
m
ent
n
um_attr in pars
e
_attr_
l
ine(), not parse_a
t
tr()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
M
i
chael
H
aggerty
Do
c
um
e
nt struct match_a
t
tr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
M
i
chae
l
Haggert
y
Add a f
i
le com
m
e
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Dmitr
y
Ivankov
f
a
st-import: prevent producing bad delta
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
D
mitry Iva
n
kov
f
a
st
-
i
m
po
r
t: add a test for tree delta base corrupti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
me
r
ge-rec
u
rs
i
ve: Don't re-so
r
t
a li
s
t
w
hose order we
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recursive: Fix
virtu
a
l merge base for rena
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6036: cri
s
s-cross + rename/rename(1to2)/add-d
e
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-
r
ecursive: A
v
o
id un
n
e
cessar
y
fi
l
e rewrites
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6022: Additional test
s
checking for unnece
s
sa
r
y
updates
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e
-
recursive:
F
i
x
spuriou
s
'
re
f
u
sing to lose u
n
tracked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6
0
22: A
d
d te
s
tcas
e
for
s
pu
r
ious "refusing to lose
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Jeff Ki
n
g
t30
3
0: fix
accidental success in symlink rename
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Fix worki
n
g
c
opy handling for rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewren
m
e
rge-rec
u
r
sive: add handling f
o
r re
n
ame/rename
/
add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
m
erge-rec
u
rs
i
ve: H
a
ve conflict_renam
e
_delete reuse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Make modify/delete handlin
g
c
o
de reu
s
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wre
n
m
e
rge-recursive: Conside
r
mod
i
fications in rename/rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive:
C
r
e
a
te
f
unction for merging
w
ith branchname
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
m
e
rg
e
-re
c
ursi
v
e: Record more data
n
e
ede
d
for m
e
rging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Defer rename/rena
m
e(2to1) handling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next