repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: Make '--log' an integer option for number of shortlog entries
2010-09-09
Ramkumar Ramachandra
merge: Make
'--lo
g
' an inte
g
er option
for num
b
er
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ra
m
achandr
a
fmt_merge_msg: Cha
n
ge fmt_merge_msg
API to accep
t
shortlog_le
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scrip
t
: lear
n
--[n
o
-]rerere-
a
utoupdate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
r
ge script: notice @{
-
1} shorthand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
eder
merge s
c
r
i
pt: han
d
le --no-ff -
-
no-c
o
mmi
t
correc
t
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nie
d
er
merge scrip
t
:
--ff-only to disallow t
r
ue merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge script:
h
andle many-way oct
o
pus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scr
i
pt: handl
e
-m --log correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
han Nieder
m
e
rg
e
s
cript: forbid
merge -s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
m
e
rge script: a
l
low custom strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: m
e
rge -X<opt
i
o
n
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
m
erge script: improve log mes
s
age subje
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
me
r
ge script: refuse t
o
merge during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Nied
e
r
merge script: t
w
e
a
k
unmerg
e
d
files message to m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge scri
p
t: --
s
quash, --ff from
u
nborn branch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-merge-msg -
m
to override merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge-base --independent to
p
r
i
n
t
reduced parent list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
Nied
e
r
merge
-
base --octopus
t
o mimi
c
show-branch
-
-merge
-
b
a
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
han Nieder
Docu
m
e
n
tation:
a
dd a SEE ALSO section for merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
de
r
t6200 (f
m
t-merge-m
s
g
)
: style nit
p
icks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Niede
r
t60
1
0 (merg
e
-base): mo
d
ernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
e
d
e
r
t7600 (merge): te
s
t merge from b
r
anch yet to be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nie
d
er
t7600 (merge): check r
e
f
l
og en
t
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan N
i
e
de
r
t7600 (merge
)
: do
n
ot la
u
nch gitk for --d
e
bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
t7600 (me
r
ge): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge: do no
t
mistak
e
(ancestor o
f
) t
a
g
for bra
n
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
u
nio C Hamano
G
it 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
i
o C Hamano
te
s
ts: correct "doe
s
reflog e
x
ist?
"
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/:
w
o
rk around one-s
h
ot variabl
e
as
s
ignment with test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonath
a
n Nieder
t
/README: correct an e
x
c
e
ption when breaking a && cha
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541,lib-httpd}: replace probl
e
m
a
tic '!
(
)' notati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brando
n
Ca
s
e
y
t
/t3700: convert
tw
o
uses of neg
a
tio
n
op
e
rator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/RE
A
DME
:
clarify
t
e
s
t_must_fail
d
escription
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
Br
o
ckman
Check s
i
ze of
path buffer before writing
i
nto it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
u
n
io C Hamano
Me
r
ge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thi
e
low
update-server-info: S
h
orten re
a
d
_pac
k
_info_file
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
Arnf
j
örð Bja
r
ma
s
o
n
git add: Add --ignore-miss
i
n
g
to SYN
O
PSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjö
r
ð Bjarmason
git submodule
add: Remove old
docs about imp
l
icit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
e
n
s Lehmann
git subm
o
dule add: Require the new --
f
orce option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge branch 'jl/add-n-ignore
-
mi
s
sing
'
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Aguilar
Documenta
t
ion: Explain git-mergetool's
use
of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
uni
o
C Haman
o
Merge bran
c
h '
j
c/di
f
f-merge-base-multi
'
commit
|
commitdiff
|
tree
2010-07-16
Thom
a
s Rast
Only
r
u
n aggregate-res
u
lts over
a
c
tua
l
counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han Nie
d
er
Add a samp
l
e user for th
e
svndump l
i
brary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jun
i
o C
H
amano
d
iff A
.
.
.
B: do not limit t
h
e syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge
branch 'jn/p
a
g
i
na
t
e-fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Me
r
g
e branch 'wp/merge-tre
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C Ha
m
ano
M
e
rge branch 'js/merge-rr-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
M
erge branch
'
jc/
d
iff-merge
-
b
a
se-mult
i
'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Ha
m
a
n
o
Mer
g
e
b
r
anch 'ns/merge-re
c
ursive-u
p
t
odate'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o
C
Hamano
Merge bra
n
ch
'jn
/
tests'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge branch 'eb/doc-log-manpag
e
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C Hama
n
o
Mer
g
e
b
ranch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge b
r
anch 'm
g
/r
e
vi
s
ion-doc'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C
Hamano
Merge
branch 'jk
/
m
aint-stat
u
s-k
e
ep
-
index-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hama
n
o
Merg
e
branch 'jc/rebase-i-comm
i
t-msg-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge br
a
nch 'ab/submodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'bc/mai
n
t-makefile-
f
ix
e
s'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Me
r
g
e
branch 'maint
'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documenta
t
ion: add sub
m
od
u
le
.
* to
the big configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
N
i
eder
git
m
o
dules
.
5: url c
a
n be a r
e
lative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Sunkar
a
gitweb: fi
x
es
c
_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nie
d
er
g
i
t
--p
a
ginate: paginate exte
r
nal commands agai
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERG
E
_RR i
s
in
.
git, not
.
git/rr-c
a
che
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
merge-tree:
f
ix
w
h
ere
t
wo bra
n
ches
s
hare n
o
changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
W
ill Palmer
a
dd basic tests
f
or merge-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Git
1
.
7
.
2-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Merge
branch 'jc/read-tree-cache-tr
e
e-fix'
commit
|
commitdiff
|
tree
2010-07-14
Ra
j
a
R Harinath
Use dev_t for
devi
c
e id (st_de
v
) from stat
in setup_git_di
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hama
n
o
diff
A
.
.
.
B
: give o
n
e p
o
ssible diff when there a
r
e more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Ham
a
no
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-07-13
Oren He
l
d
git
fetch documentatio
n
: descri
b
e short
'
-
p
' s
y
nonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
M
i
klos Vajna
form
a
t
-
patch:
docum
e
n
t
the format
.
to configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git
a
dd: Add the "-
-
ignore-miss
i
ng
"
option for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
ichael J
Gruber
test-
l
ib
:
TAP complia
n
ce for ski
p
ping
t
e
sts on request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Mic
h
ael J Gruber
test-l
i
b:
s
imp
l
ify GIT_SKIP_TE
S
T
S lo
o
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
Me
r
ge branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2010-07-12
J
onathan N
i
eder
t3000 (
l
s-
f
i
l
es -o): modernize
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik S
k
olmli
Documentation: Sp
e
l
li
n
g
fix in protoco
l
-
c
apabilities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
Sebrec
h
t
m
e
rge-recursive:
u
se
"
up-t
o
-
date" instead of "uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
S
ebrecht
ch
e
ckout:
a
ccord documentation to
w
hat git doe
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johann
e
s
S
i
xt
t
0
005: work around strange $? in
k
sh when program termin
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Ha
m
ano
Merge remote
b
r
anch 'k
o
/master' into jc/read-tree-ca
c
h
e
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o Yang
diff
.
c
:
fix
a
graph out
p
ut bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð B
j
a
r
mason
tests: Use skip_
a
ll=* to skip test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ju
n
io C Ha
m
ano
Fi
x
"read-tre
e
-
m
A B" priming the
c
a
c
he-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli B
a
rzila
y
Reorganiz
e
`git-log' man page t
o
clari
f
y
com
m
on diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -O: Do n
o
t pass color sequenc
e
s as filenames to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C H
a
man
o
Git 1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Haman
o
M
e
rg
e
branch 'ab/tap
'
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Haman
o
M
erge
br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
backmerge a
f
ew more fixes
to 1
.
7
.
1
.
X series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Merge branch
'
m
aint-1
.
6
.
4'
into
m
aint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-Kön
i
g
r
e
v-parse: fix --parse-opt --
k
eep-da
s
hdash
--stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
a
m
an
o
Merge branch 'mg/doc-rev-parse
-
treepath-syntax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
Merge branch 'tr/receive-p
a
ck-aliased-update-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Ha
b
ouz
i
t
fix gi
t
bra
n
ch -
m
in pres
e
nce of cross devices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
B
randon Casey
t/t0006:
s
pecify timezone as EST5 n
o
t EST to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
do not write out
index
w
hen statu
s
doe
s
n
o
t have to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next