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
builtin/merge.c: collect other parents early
2012-04-18
Junio C Ha
m
ano
built
i
n/merge
.
c: collec
t
other pa
r
e
n
ts early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Hamano
b
u
iltin/merge
.
c: remove "remo
t
eheads"
g
lobal var
i
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-18
M
i
ch
a
ł Kiedro
w
i
cz
merg
e
tests: octopus with redu
n
d
a
n
t
parents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merge branch
'
maint-1
.
7
.
8' into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
e
rge b
r
a
nch 'jc/maint-ver
i
fy-objects-r
e
move-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C
H
a
m
a
no
Merge
b
ranch 'dw/gi
t
web-doc-g
r
ammo
'
into maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
no
Merge branch 'tr/cache-tr
e
e' into maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
i
o C Hamano
Merge branch
'
cb/maint-t5
5
41-make-server-p
o
rt-portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge bra
n
ch '
c
n/maint-rev-list-doc
'
int
o
m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
M
e
rge bra
n
ch 't
r
/maint-bundle-boundary
'
i
n
to
mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'tr/maint-bundle-
l
ong-
s
ubject' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
Merge bra
n
ch 'ph/rer
e
r
e-
d
oc' int
o
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io
C Hamano
Git 1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Jun
i
o
C Haman
o
Merge bran
c
h 'jc/maint-merge
-
a
ut
o
edit' in
t
o maint
commit
|
commitdiff
|
tree
2012-03-30
Heiko Vo
i
g
t
string
-
li
s
t:
document that s
t
r
ing_lis
t
_insert() inserts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Hamano
Git 1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
M
erge
b
ranch 'jn/ma
i
nt-fast-im
p
ort-
e
mp
t
y
-ls' into
m
aint
commit
|
commitdiff
|
tree
2012-03-26
J
u
nio C
Hamano
Merge branch 'ph/re
r
ere-doc
'
into maint
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C
H
amano
Merge br
a
nch '
m
s/main
t
-config-
e
r
r
or-at-eol-line
c
ount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
M
ark Lo
d
ato
grep d
o
c: add --break /
-
-h
e
ading / -W to s
y
nopsis
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
R
o
drigo Silva (Mestr
.
.
.
D
oc
u
men
t
ation:
i
mprove d
e
sc
r
i
ption of GIT_EDITOR and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Nelson Benitez Leon
documentat
i
o
n
: fix alphabeti
c
ordered list f
o
r git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
D Wa
i
tzman
D
o
c
ume
n
tatio
n
/gitweb
:
trivia
l
Engl
i
s
h fixes
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hama
n
o
M
e
rge bran
c
h
'maint-1
.
7
.
8' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-20
Junio C Haman
o
merge: backport GIT_MERGE_AUTOEDIT s
u
pport
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
Mer
g
e branch 'ks
/
so
r
t-wi
l
dca
r
d-in-make
f
ile'
i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
Haman
o
Merge branch 'jc/a
d
vise-i1
8
n' into main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
Hamano
Merge bran
c
h 'jn/gitw
e
b-unspecifie
d
-action' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Ju
n
io C Hamano
fetch/receive: remove over-pe
s
simistic connectivity
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Git
1
.
7
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
M
e
rge branc
h
'
tr
/
m
a
int-b
u
n
dle-b
o
undary' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-12
Junio
C Ha
m
ano
Merge
branch 'j
c
/maint-diff-patch-
h
eader'
into maint
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C H
a
mano
Mer
g
e b
r
anch 'j
n
/maint
-
d
o-not-match-with-unsani
t
ized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io C H
a
mano
M
e
rg
e
bra
n
ch 'jc
/
am-
3
-
n
o
n
standard-
p
opt' into maint
commit
|
commitdiff
|
tree
2012-03-12
Martin Stenberg
config: report errors
at the EO
L
wit
h
correct line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere: Document 'rerere rema
i
ning'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Jak
u
b Nareb
s
ki
git
w
eb
:
Fix fixed s
t
ring (non-re
g
exp
)
p
r
oje
c
t
search
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
T
h
omas Rast
t5704: f
i
x non
p
ortabl
e
s
e
d/grep usages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Ju
n
io
C
Hamano
Merge bra
n
ch 'maint-1
.
7
.
8
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Merge branc
h
'
main
t
-1
.
7
.
7' into ma
i
n
t-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Thom
a
s Rast
Do
c
ument t
h
e --histo
g
ram d
i
ff
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
m
ano
Git 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
Merge branch
'jc/doc
-
merge-options'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-05
J
uni
o
C H
a
mano
Merge branch '
c
n/maint-rev-list-
d
oc' into maint
commit
|
commitdiff
|
tree
2012-03-05
Th
o
mas Ra
s
t
fast-import
:
ze
r
o all of 's
t
r
u
ct tag' to silence v
a
lgrind
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io
C Hamano
Update
dr
a
ft release
n
otes to
1
.
7
.
9
.
3 for the
l
ast
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io
C Hamano
M
e
rge branch 'cn/maint-branc
h
-wit
h
-bad' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Ham
a
no
Merg
e
branch 'jn/main
t
-
g
i
tweb-inval
i
d-
r
egexp'
into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Ha
m
a
n
o
Merge bra
n
ch
'
n
d
/maint-verify-objects' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branc
h
'jk/m
a
int-avoid-streamin
g
-filt
e
r
e
d-co
n
t
ents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
Me
r
ge b
r
anch 'jb/filter-ig
n
ore-sigp
i
pe' in
t
o maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
amano
M
e
rge branch 's
p
/smart-http-failure-to
-
p
u
sh'
into m
a
int
commit
|
commitdiff
|
tree
2012-03-05
Junio
C Ha
m
a
n
o
Merge br
a
nch 'tr/maint
-
bundle-l
o
ng-subject' into maint
commit
|
commitdiff
|
tree
2012-03-05
C
le
m
ens Buchacher
htt
p
.
proxy: also
mention
h
ttps_prox
y
a
n
d all_proxy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-03
Michael J Gruber
t0300: work aro
u
nd bu
g
in dash 0
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-03
T
om Grennan
t5
5
12
(ls-r
e
mote)
:
moder
n
i
z
e style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
Stefano
L
a
ttarini
t
e
sts: fix s
p
urio
u
s error
w
hen run directly
with Solaris
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-02
J
u
n
i
o C
Hamano
Documentat
i
o
n: do no
t
a
s
s
ume t
h
at
n
> 1
in
<rev>~$n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
b
u
ndle: keep around names
p
assed
t
o add_p
e
nding
_
object()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
T
h
omas
Rast
t
5510:
e
nsure w
e
s
t
ay in the top
l
evel test di
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
T
ho
m
as
Rast
t551
0
: refactor bu
n
dle->pa
c
k conversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
diff -p: squelch "diff --git"
header
f
or stat-dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio
C
Hamano
t4011: illustrat
e
"diff-i
n
dex -p" on
s
tat-dirty paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4011: modernis
e
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-01
Lib
o
r Pechace
k
Docum
e
ntation f
i
xes in git-config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Car
l
os Martín Ni
e
t
o
D
o
cument
a
tion: us
e
{ast
e
ris
k
} in rev-list-op
t
i
ons
.
txt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Jakub N
a
rebski
gitw
e
b: Handl
e
invalid regexp
in rege
x
p
s
earch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Ngu
y
ễ
n Thái
N
gọc Duy
re
v
-list: fix --verify-o
b
jects --q
u
iet becoming --objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn Thái Ngọc Duy
rev-li
s
t:
r
e
m
ove BI
S
ECT_SHOW_
T
RIE
D
flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Update draft rele
a
s
e
n
o
tes to 1
.
7
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C
H
amano
Merge branch 'pj/re
m
ot
e
-set-branches-usage-fix' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
i
o
C Hamano
Merge branch 'jn/
g
itweb-unb
o
rn-he
a
d' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge
bra
n
ch 'jn/anc
i
e
n
t-
m
eld-support' into main
t
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
M
e
rge
branch 'tr
/
merge-edit-guid
a
n
c
e' into main
t
commit
|
commitdiff
|
tree
2012-02-27
Tim He
n
i
g
an
Codin
g
Guidelines: do not us
e
'which'
i
n
shel
l
scrip
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Tim He
n
igan
CodingG
u
idel
i
ne
s
: Add
a
note about spaces af
t
e
r
r
e
direction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Carlo
s
Martín Nieto
b
r
a
n
c
h
: don't
a
ssume
t
he merge filter ref exist
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
hae
l
H
aggerty
p
o
s
t
-
receive-email: match up $LOGBEGIN
.
.
$LOGEN
D
pairs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
hael Haggerty
post-r
e
c
e
ive
-
e
mail: remove unused varia
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
an
o
test
:
"am -3"
c
an accept non-standard -
p
<num>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
Do
c
ument ac
c
u
m
u
lated fixes s
i
nce
1
.
7
.
9
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Haman
o
M
e
rge branch 'jc/add-ref
r
es
h
-
u
nmerged'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2012-02-27
J
unio C
Hamano
Merge branch 'j
s
/co
n
figur
e
-lib
i
ntl' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Sync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
a
mano
Git 1
.
7
.
8
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
hał Kiedrowicz
grep
-
P: F
i
x mat
c
h
i
ng ^ and $
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Jim
M
e
y
ering
am: don't i
n
floop fo
r
an empty
input file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
A
n
d
r
ew W
o
ng
reb
a
se -m
:
only call
"
n
o
t
es
c
o
py"
whe
n
rewritt
e
n exis
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pet
e
Wyckoff
git-p4: remove bash-ism in
t
9800
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
git-p4: remove bash-ism in t9809
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
git-p4: fix submit regression with
cli
e
ntSpe
c
and subd
i
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-27
Pe
t
e W
y
ck
o
ff
git-p4
:
set useC
l
ientSp
e
c
v
ar
i
able on ini
t
ial cl
o
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-26
D
m
itr
y
V
.
Levin
Makefile: add threa
d
-
utils
.
h to LIB_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-24
J
e
ff King
do not stream large fi
l
es to pack
w
hen
f
ilters ar
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-24
Jeff King
teach
d
ry-run convert_to_gi
t
not to require a src buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-24
Jeff
King
teach conv
e
r
t_to_gi
t
a "dr
y
run" mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
T
h
oma
s
R
a
st
t
5
7
04
:
match tests to modern style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
T
h
omas
R
ast
strbuf:
improve strbuf
_
g
e
t*li
n
e documen
t
ati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
M
a
tthieu
Moy
README: point
t
o Documentation/Submit
t
i
n
gPatch
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-02-23
Junio C
H
amano
Docu
m
ent merge
.
branchdesc
c
onfigur
a
tion varia
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next