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
Hamano
buil
t
in/me
r
ge
.
c: c
o
llect other
p
arents early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio
C
Ha
m
a
no
builtin/merge
.
c: r
e
move "remoteheads"
g
l
o
bal variabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Michał Kiedrowicz
merge
tests: octopus with redund
a
nt parents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
J
un
i
o C Hama
n
o
Merge bran
c
h
'maint-1
.
7
.
8' into
m
a
i
n
t-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
Me
r
ge
b
r
a
nch
'jc/maint-verify-objects-
r
emove-pessim
i
sm
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Hamano
Merge branch
'dw/gitwe
b
-
do
c
-
g
rammo'
into maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C Hamano
Merge
b
ranch 'tr/cache
-
tree
'
i
nto main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
e
r
ge br
a
nch 'cb/main
t
-t5541-make-se
r
ver-port-porta
b
le
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C H
a
m
ano
Merge branch 'cn/maint-rev-li
s
t-doc' i
n
to maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
H
amano
Merge branch
'
tr/maint-bundle-boundar
y
' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge
branch 'tr
/
maint
-
b
un
d
le
-
long-subject' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Hamano
Merge branch 'ph/r
e
rere-d
o
c' into m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C
H
amano
Git
1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
J
uni
o
C Hamano
M
e
r
ge branch 'j
c
/main
t
-merge-autoedit' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-30
Hei
k
o Voigt
string-lis
t
: document that string_list_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
Mer
g
e branch
'
jn/m
a
i
nt-fast-import-emp
t
y-ls' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2012-03-26
Juni
o
C Hamano
Me
r
ge branch 'ph/rerere-doc' into main
t
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
Merge branch '
m
s/main
t
-config-error-at-eol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
M
ark Lodat
o
grep doc
:
a
dd --br
e
a
k / --heading / -W
to s
y
nopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Silva (Mestr
.
.
.
D
o
cu
m
en
t
ation:
i
m
prove
description of GIT_EDITOR and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nelson
Benitez
L
eon
documentation:
f
ix
alphabetic ordered list
f
or git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D
W
aitzman
Documentat
i
on/gitw
e
b: trivial Eng
l
i
sh f
i
x
es
commit
|
commitdiff
|
tree
2012-03-20
Junio
C Hamano
M
e
rge branch 'maint-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
merge:
b
a
c
kport GIT_MERGE_AUTOEDIT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Mer
g
e branch 'ks/sort-wil
d
card-i
n
-makefile' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
M
e
rge br
a
nch 'jc/a
d
v
ise-i18n' into
m
a
int-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
i
o C Hamano
Merge branch
'jn/gitweb-unspecified-action' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio
C
Haman
o
f
e
t
ch/
r
ecei
v
e: remove
o
ver-pessim
i
stic
c
onnectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o
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
Merge branch 'tr/
m
a
int-bun
d
le-boun
d
ary' into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge br
a
nch 'jc/
m
aint-diff-patch-header' in
t
o maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
man
o
Merg
e
br
a
nch 'jn/
m
ai
n
t-do-not-m
a
t
ch-
w
ith-un
s
anitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ham
a
no
Merge branch 'j
c
/am-3-nonstandar
d
-
popt'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-12
Marti
n
S
tenberg
config: re
p
ort
errors at the
EOL wi
t
h corre
c
t line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Ph
i
l Hord
re
r
ere: Docum
e
nt 'rerere remaining'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Jakub Narebs
k
i
gitweb
:
F
ix fixed string (non-re
g
e
xp) project sear
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
T
h
omas Rast
t
5704:
fix
nonportable sed/grep usages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Junio
C
Hamano
Merge branch 'maint-1
.
7
.
8
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-06
Junio
C Hamano
Mer
g
e branch 'mai
n
t-1
.
7
.
7'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Tho
m
as Rast
Docum
e
nt the -
-
hi
s
togr
a
m di
f
f option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
G
i
t 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
M
er
g
e branch 'jc/d
o
c-merge-options' in
t
o maint
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
i
o
C Hamano
Merge branc
h
'cn/ma
i
n
t-rev-list-doc' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Thomas Rast
fast-
i
mport: ze
r
o all of
'
s
t
r
uct tag' t
o
sil
e
nce valgrin
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
Upd
a
te draft rel
e
ase
n
otes to 1
.
7
.
9
.
3
for the last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Hamano
M
e
rg
e
branch
'cn/maint-b
r
a
n
c
h
-with-bad' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
a
m
ano
Mer
g
e bran
c
h 'jn
/
maint-gitweb-invalid-regexp' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C
Hamano
Merge bran
c
h
'nd/maint
-
v
erify-objects' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch 'jk/
m
aint-avoid-s
t
r
e
aming-filtered-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Hamano
Me
r
ge branch '
j
b/fi
l
ter-ignore-sigp
i
pe' into m
a
int
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
amano
M
e
rg
e
bran
c
h
'sp/smart-
h
ttp-fa
i
lure-to-p
u
sh'
into
m
aint
commit
|
commitdiff
|
tree
2012-03-05
J
unio
C Hamano
Merge
branch 'tr/maint-bu
n
dle-long-subject' into maint
commit
|
commitdiff
|
tree
2012-03-05
Clemens Buchache
r
h
ttp
.
pr
o
xy: also menti
o
n https_proxy and a
l
l_proxy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Mi
c
h
a
el J Grube
r
t0300
:
work around bug in das
h
0
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Tom Gren
n
an
t5512 (ls-rem
o
te): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
Stefano L
a
tt
a
rini
tests: fix spurious error whe
n
run
dire
c
tly with Solaris
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
Junio C Hamano
Docu
m
e
n
tation
:
do not assume that n > 1 in <r
e
v>
~
$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thom
a
s Rast
b
u
ndle: ke
e
p aroun
d
names pass
e
d to add_pending_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
T
h
omas R
a
st
t5510: ensure we stay i
n
the toplevel test dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
T
homas R
a
st
t5510
:
refa
c
tor bundl
e
-
>pac
k
conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Jun
i
o C Hamano
diff -p: squelch "diff --git" header f
o
r
stat-di
r
ty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4011: illus
t
rate "diff-i
n
dex -p" on stat-dirty
p
aths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4011: mode
r
nise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Libor Pechac
e
k
Documentatio
n
fixes in g
i
t-c
o
nfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Carl
o
s
Mar
t
í
n
N
i
e
t
o
Doc
u
menta
t
ion: use {asterisk}
in rev
-
list-options
.
txt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Jak
u
b Na
r
ebski
gitweb: Ha
n
dle
invalid regexp
i
n regexp
s
earch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn
T
hái Ngọc Duy
r
e
v-list: f
i
x --verify-
o
bjects --quiet becoming --objec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn
T
hái Ngọc Du
y
rev-list: remov
e
BIS
E
CT_SH
O
W_TR
I
ED flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Haman
o
Update draft release note
s
to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
Merge branch 'pj/remote-set-branches-usage
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
M
e
rge
b
r
a
nch 'jn
/
g
i
tweb-unborn-head' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
io C
H
amano
M
e
rge branch '
j
n/a
n
cient-m
e
ld
-
s
u
p
p
o
rt' into maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C
H
amano
Merg
e
branch 't
r
/merge-edit-guidance'
into maint
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
CodingGuidelines: do no
t
use '
w
hich'
in shell scri
p
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
Codi
n
gGuide
l
i
n
e
s
:
Ad
d
a note abou
t
spaces after
redirectio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Carlos Martín
Nieto
branc
h
: don't assume
t
h
e merge
filter
ref
e
xists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
h
a
el Hag
g
erty
post-receive-email: match
u
p $LOG
B
EGIN
.
.
$LOGEND pai
r
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michael Haggerty
post
-
receiv
e
-e
m
ail: re
m
o
v
e
unused varia
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
test: "am -3" can accept
non-stan
d
ard -p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C
H
ama
n
o
D
o
cument accum
u
l
ated fixes since
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
M
erge
b
ranch
'
jc
/
add-refresh-unme
r
ged' int
o
maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
M
e
rge branch 'js/configure-libintl
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
amano
Sync wit
h
1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Mic
h
ał Kie
d
row
i
cz
grep -
P
:
Fix m
a
tching ^ and $
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Jim Meyering
am: don't infloop for an empty
input file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
An
d
rew Wong
rebase -m: only call "notes copy" w
h
en re
w
ritt
e
n exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyc
k
o
ff
gi
t
-p4: remo
v
e bash-ism in
t
9
800
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete W
y
c
k
off
g
it-p4: rem
o
ve
b
ash
-
is
m
in t9809
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete W
y
ck
o
ff
git-p4:
f
ix submit r
e
gressio
n
with clientSpec and su
b
dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
P
e
te Wyckoff
gi
t
-
p4: set u
s
eClientS
p
ec variab
l
e
on initial clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-26
Dmitr
y
V
.
Levin
Makefi
l
e
: add thread-utils
.
h t
o
LIB
_
H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Jeff King
do not stream large files to
p
ack when fi
l
te
r
s
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Jeff King
teach dry-run convert_to_git n
o
t to require a src buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Jeff K
i
ng
t
e
ach convert_to_git a "dry run" mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Thomas Rast
t5704: match tests to modern sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Thoma
s
Rast
strbuf: improve strbuf
_
get*line docum
e
nta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Matth
i
e
u Moy
REA
D
ME: point to
Doc
u
mentatio
n
/Subm
i
tt
i
ngPatches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Jun
i
o C H
a
mano
Document merge
.
b
r
a
n
chdesc configura
t
ion variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next